Changeset 12040 for trunk

Timestamp:

09/08/11 21:48:27 (13 years ago)

Author:

tbretz

Message:

Added the correct path to DimWriteStatistics; fixed the extraction region in the call of CalibData::GetPixelMax; do not limit sending rate of DRS calib result for feedback; set g_maxProc to 3

File:

• trunk/FACT++/src/EventBuilderWrapper.h (modified) (9 diffs)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -136 +136 @@
             if (access((name+"drs.fits").c_str(), F_OK) == 0)
                 break;
+
         }
 
@@ -166 +167 @@
 
         fPath = path;
+
+        fDimWriteStats.SetCurrentFolder(fPath);
 
         return InitRunNumber();
@@ -199 +202 @@
 
         memset(fNumEvts, 0, sizeof(fNumEvts));
-
         fDimEvents.Update(fNumEvts);
 
@@ -287 +289 @@
 
         g_runStat = kModeRun;
+        g_maxProc = 3;
 
         fMsg.Message("Starting EventBuilder thread");
@@ -401 +404 @@
     int  GetNumConnected(int i) const { return gi_NumConnect[i]; }
 
+    /*
+    bool IsConnected(int i) const     { return gi_NumConnect[i]>0; }
+    bool IsConnecting(int i) const    { return !IsConnected(i) && !IsDisconnected(i); }
+    bool IsDisconnected(int i) const  { return gi_NumConnect[i]<=0 && g_port[i].sockDef==0; }
+    int  GetNumConnected(int i) const { return gi_NumConnect[i]; }
+    */
+
     void SetIgnore(int i, bool b) const { if (g_port[i].sockDef!=0) g_port[i].sockDef=b?-1:1; }
     bool IsIgnored(int i) const { return g_port[i].sockDef==-1; }
@@ -564 +574 @@
     }
 
-    int runWrite(FileHandle_t handler, EVENT *e, size_t)
+    int runWrite(FileHandle_t handler, EVENT *e, size_t sz)
     {
         DataProcessorImp *file = reinterpret_cast<DataProcessorImp*>(handler);
@@ -870 +880 @@
                 break;
 
+        /*
         // FIXME: Time limit?!
-        /*
         static Time oldt(boost::date_time::neg_infin);
         Time newt;
 
         // FIXME: Only send events if the have newer run-numbers
-        if (newt<oldt+boost::posix_time::seconds(1))
-            return 0;
+        if (newt<oldt+boost::posix_time::milliseconds(100))
+            return;
 
         oldt = newt;
@@ -883 +893 @@
 
         // FIXME: Check event type here
-        return;
 
         const size_t sz = sizeof(EVENT)+event->Roi*2*1440;
@@ -894 +903 @@
         DataCalib::Apply(vec, event->Adc_Data, event->StartPix, event->Roi);
 
-        vector<float> data2(1440); // Mean, RMS, Max, Pos
-        CalibData::GetPixelMax(data2.data(), vec, event->Roi, 0, event->Roi);
-
+        vector<float> data2(1440); // Mean, RMS, Max, Pos, first, last
+        CalibData::GetPixelMax(data2.data(), vec, event->Roi, 0, event->Roi-1);
+
+//        dim_lock();
         fDimFeedbackData.Update(data2);
+//        dim_unlock();
     }