Changeset 11207 for trunk/FACT++/src/EventBuilderWrapper.h

Timestamp:

06/29/11 15:13:47 (13 years ago)

Author:

tbretz

Message:

Many little and more changed to teh FAD and event builder controls; added DRS temperature transmission

File:

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

trunk/FACT++/src/EventBuilderWrapper.h

@@ -702 +702 @@
     enum
     {
-        kCurrent = 0,
-        kTotal   = 1
+        kCurrent   = 0,
+        kTotal     = 1,
+        kEventId   = 2,
+        kTriggerId = 3,
     };
 
@@ -718 +720 @@
 
     uint32_t fMaxRun;
-    uint32_t fNumEvts[2];
+    uint32_t fLastOpened;
+    uint32_t fLastClosed;
+    uint32_t fNumEvts[4];
 
     DimDescribedService fDimRuns;
@@ -727 +731 @@
     DimDescribedService fDimStatus;
     DimDescribedService fDimDNA;
+    DimDescribedService fDimTemperature;
     DimDescribedService fDimStatistics;
 
@@ -739 +744 @@
 public:
     EventBuilderWrapper(MessageImp &imp) : fMsg(imp),
-        fFileFormat(kRaw), fMaxRun(0),
-        fDimRuns        ("FAD_CONTROL/RUNS",             "I:3", ""),
-        fDimEvents      ("FAD_CONTROL/EVENTS",           "I:2", ""),
+        fFileFormat(kRaw), fMaxRun(0), fLastOpened(0), fLastClosed(0),
+        fDimRuns        ("FAD_CONTROL/RUNS",             "I:5", ""),
+        fDimEvents      ("FAD_CONTROL/EVENTS",           "I:4", ""),
         fDimEventData   ("FAD_CONTROL/EVENT_DATA",       "S:1;I:1;S:1;I:2;S:1;S", ""),
         fDimFwVersion   ("FAD_CONTROL/FIRMWARE_VERSION", "F:42", ""),
@@ -747 +752 @@
         fDimStatus      ("FAD_CONTROL/STATUS",           "S:42", ""),
         fDimDNA         ("FAD_CONTROL/DNA",              "X:40", ""),
+        fDimTemperature ("FAD_CONTROL/TEMPERATURE",      "F:82", ""),
         fDimStatistics  ("FAD_CONTROL/STATISTICS",       "X:8",  ""),
         fDebugStream(false), fDebugRead(false)
@@ -942 +948 @@
     void UpdateRuns()
     {
-        uint32_t values[3] =
+        uint32_t values[5] =
         {
             static_cast<uint32_t>(fFiles.size()),
             0xffffffff,
-            0
+            0,
+            fLastOpened,
+            fLastClosed
         };
 
@@ -960 +968 @@
                 values[2] = file->GetRunId();
         }
+
+        fMaxRun = values[2];
 
         fDimRuns.Update(values);
@@ -990 +1000 @@
         fFiles.push_back(file);
 
+        fLastOpened = runid;
         UpdateRuns();
+
+        fNumEvts[kEventId] = 0;
+        fNumEvts[kTriggerId] = 0;
 
         fNumEvts[kCurrent] = 0;
@@ -1008 +1022 @@
         if (file->GetRunId()==fMaxRun)
         {
-            //fDimCurrentEvent.Update(e->EventNum);
             fNumEvts[kCurrent]++;
+            fNumEvts[kEventId]   = e->EventNum;
+            fNumEvts[kTriggerId] = e->TriggerType;
         }
 
         fNumEvts[kTotal]++;
 
-        static Time oldt;
+        static Time oldt(boost::date_time::neg_infin);
         Time newt;
         if (newt>oldt+boost::posix_time::seconds(1))
@@ -1021 +1036 @@
             oldt = newt;
         }
+
 
         // ===> SignalEvtWritten(runid);
@@ -1051 +1067 @@
         fFiles.erase(it);
 
+        fLastClosed = file->GetRunId();
         UpdateRuns();
+
+        fDimEvents.Update(fNumEvts);
 
         const bool rc = file->Close(tail);
@@ -1253 +1272 @@
         str << "): " << message;
 
+        static string last;
+        if (str.str()==last)
+            return;
+
+        last = str.str();
         fMsg.Update(str, severity);
     }
@@ -1451 +1475 @@
             Update(fDimStatus, sts);
         }
+
+        static Time oldt(boost::date_time::neg_infin);
+        Time newt;
+
+        if (newt>oldt+boost::posix_time::seconds(1))
+        {
+            const boost::array<int16_t,42> tmp[4] =
+            {
+                Compare(&h, &h.fTempDrs[0]),
+                Compare(&h, &h.fTempDrs[1]),
+                Compare(&h, &h.fTempDrs[2]),
+                Compare(&h, &h.fTempDrs[3])
+            };
+
+            vector<int16_t> data;
+            data.reserve(82);
+            data.push_back(tmp[0][0]);
+            data.insert(data.end(), tmp[0].data()+2, tmp[0].data()+42);
+            data.push_back(tmp[0][1]);
+            data.insert(data.end(), tmp[0].data()+2, tmp[0].data()+42);
+
+            for (int j=0; j<=3; j++)
+            {
+                const boost::array<int16_t,42> &ref = tmp[j];
+
+                // Gloabl min
+                if (ref[40]<data[0])
+                    data[0] = ref[40];
+
+                // Global max
+                if (ref[41]>data[40])
+                    data[40] = ref[41];
+
+                for (int i=0; i<40; i++)
+                {
+                    // min per board
+                    if (ref[i]<data[i+1])
+                        data[i+1] = ref[i];
+
+                    // max per board
+                    if (ref[i]>data[i+41])
+                        data[i+41] = ref[i];
+                }
+            }
+
+            vector<float> deg(82);
+            for (int i=0; i<82; i++)
+                deg[i] = data[i]/16.;
+            fDimTemperature.Update(deg);
+        }
+
+
 
         /*