Changeset 18630

Timestamp:

09/18/16 19:10:43 (8 years ago)

Author:

tbretz

Message:

Distribute run and event number with the EVENT_DATA service

File:

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

trunk/FACT++/src/EventBuilderWrapper.h

@@ -92 +92 @@
     DimDescribedService fDimIncomplete;
 
+    struct EventData
+    {
+        uint32_t runNum;
+        uint32_t evNum;
+        float data[4*1440];
+    }  __attribute__((__packed__));
+
     Queue<pair<Time,GUI_STAT>>                      fQueueStatistics1;
     Queue<tuple<Time,bool,FAD::EventHeader>>        fQueueProcHeader;
@@ -98 +105 @@
     Queue<pair<Time,array<uint16_t,2>>>             fQueueRoi;
     Queue<vector<char>>                             fQueueRawData;
-    Queue<tuple<Time,uint32_t,array<float,1440*4>>> fQueueEventData;
+    Queue<tuple<Time,uint32_t,EventData/*array<float,1440*4>*/>> fQueueEventData;
     Queue<tuple<Time, array<uint32_t,40>, array<int16_t,160>>> fQueueTempRefClk;
 
@@ -107 +114 @@
 
     array<uint16_t,2> fVecRoi;
-    pair<float,array<float, 1440*4>> fMaxEvent; // Maximum event from applyCalib
+    pair<float,EventData/*array<float, 1440*4>*/> fMaxEvent; // Maximum event from applyCalib
 
 protected:
@@ -240 +247 @@
                                                            "|start_tm[int16]:start sample of time marker channels"
                                                            "|adc[int16]:adc data"),
-        fDimEventData   ("FAD_CONTROL/EVENT_DATA",         "F:1440;F:1440;F:1440;F:1440", "|avg:|rms:|max:|pos"),
+        fDimEventData   ("FAD_CONTROL/EVENT_DATA",         "I:1;I:1;F:1440;F:1440;F:1440;F:1440", "|run:|evt:|avg:|rms:|max:|pos"),
         fDimFeedbackData("FAD_CONTROL/FEEDBACK_DATA",      "F:1440", ""),
         fDimFwVersion   ("FAD_CONTROL/FIRMWARE_VERSION",   "F:42",
@@ -297 +304 @@
         fQueueTempRefClk( std::bind(&EventBuilderWrapper::UpdateDimTempRefClk,  this, placeholders::_1)),
         fNightAsInt(0), fRunInProgress(-1),
-        fMaxEvent(make_pair(-FLT_MAX, array<float,1440*4>()))
+        fMaxEvent(make_pair(-FLT_MAX, EventData()/*array<float,1440*4>()*/))
     {
         if (This)
@@ -965 +972 @@
     }
 
-    bool UpdateDimEventData(const tuple<Time,uint32_t,array<float, 1440*4>> &tup)
+    bool UpdateDimEventData(const tuple<Time,uint32_t,EventData/*array<float, 1440*4>*/> &tup)
     {
         fDimEventData.setQuality(get<1>(tup));
@@ -1032 +1039 @@
 
             // If this is a cosmic event
-            array<float, 1440*4> stats; // Mean, RMS, Max, Pos
-            const float max = DrsCalibrate::GetPixelStats(stats.data(), vec.data(), roi, 15, 5);
+            EventData edat;
+            edat.runNum = evt.runNum;
+            edat.evNum  = evt.evNum;
+            //array<float, 1440*4> stats; // Mean, RMS, Max, Pos
+            const float max = DrsCalibrate::GetPixelStats(edat.data, vec.data(), roi, 15, 5);
             if (evt.trgTyp==0 && max>fMaxEvent.first)
-                fMaxEvent = make_pair(max, stats);
+                fMaxEvent = make_pair(max, edat);
 
             // ------------------ Update dim service (statistics) ---------------------
@@ -1041 +1051 @@
             if (fQueueEventData.empty() && now>fLastDimEventData+boost::posix_time::milliseconds(4999))
             {
-                fQueueEventData.emplace(evt.time, evt.trgTyp, evt.trgTyp==0 ? fMaxEvent.second : stats);
+                edat.evNum  = evt.evNum;
+                edat.runNum = evt.runNum;
+
+                fQueueEventData.emplace(evt.time, evt.trgTyp, evt.trgTyp==0 ? fMaxEvent.second : edat);
                 if (evt.trgTyp==0)
                     fMaxEvent.first = -FLT_MAX;