Changeset 13562 for trunk

Timestamp:

05/04/12 19:52:00 (13 years ago)

Author:

tbretz

Message:

Removed event counter - there is only one event per second anyway; implemented different scaling depending on whether the event is calibrated or not

File:

• trunk/FACT++/src/smartfact.cc (modified) (3 diffs)

trunk/FACT++/src/smartfact.cc

@@ -68 +68 @@
     deque<float> fFtmControlTriggerRateHist;
 
-    uint8_t fFadControlEventCounter;
-
     // ------------- Initialize variables before the Dim stuff ------------
 
@@ -383 +381 @@
             return;
 
-        //if (fFadControlEventCounter++%30)
-        //    return;
 
         //const float *avg = d.ptr<float>();
         //const float *rms = d.ptr<float>(1440*sizeof(float));
-        const float *max = d.ptr<float>(1440*sizeof(float)*2);
+        const float *dat = d.ptr<float>(1440*sizeof(float)*2);
         //const float *pos = d.ptr<float>(1440*sizeof(float)*3);
 
-        vector<float> dat(160, 0);
+        vector<float> max(160, -2000);
         for (int i=0; i<1440; i++)
         {
             const int idx = fPixelMap.index(i).hw()/9;
-            if (max[i]>dat[idx])
-                dat[idx]=max[i];
-            //dat[idx] += max[i];
-        }
-
-        WriteBinary("fadcontrol-eventdata", dat, 4000, 2000);
+            if (dat[i]>max[idx])
+                max[idx]=dat[i];
+        }
+
+        switch (d.qos)
+        {
+        case 0:  WriteBinary("fadcontrol-eventdata", max, 2000, 1000); break;
+        case 1:  WriteBinary("fadcontrol-eventdata", max, 2000,    0); break;
+        default: WriteBinary("fadcontrol-eventdata", max, 1000,  500); break;
+        }
     }
 
@@ -617 +617 @@
 public:
     StateMachineSmartFACT(ostream &out=cout) : StateMachineDim(out, "SMART_FACT"),
-        fFadControlEventCounter(0),
         //---
         fStatusDim         (make_pair(Time(), -2)),