Changeset 11731 for trunk/FACT++/src

Timestamp:

07/31/11 12:03:01 (13 years ago)

Author:

tbretz

Message:

Removed DimTriggerCounter; added DimTreiggerRates

Location:

trunk/FACT++/src

Files:

• HeadersFTM.h (modified) (4 diffs)
• ftmctrl.cc (modified) (6 diffs)

trunk/FACT++/src/HeadersFTM.h

@@ -147 +147 @@
     } __attribute__((__packed__));
 
+    /*
     struct DimTriggerCounter
     {
@@ -158 +159 @@
         }
     } __attribute__((__packed__));
-
+    */
 
     struct StaticDataBoard
@@ -535 +536 @@
         uint16_t fRateOverflow[40];
 
+        uint16_t fPrescaling[40];
+
         uint16_t fCrcError[40];
 
         uint16_t fState;
 
-        DimDynamicData(const Header &h, const DynamicData &d) :
+        DimDynamicData(const Header &h, const DynamicData &d, const StaticData &s) :
             fTimeStamp(h.fTimeStamp),
             fOnTimeCounter(d.fOnTimeCounter),
@@ -554 +557 @@
                 for (int j=0; j<4; j++)
                     fRatePatch[i*4+j] = d[i].fRatePatch[j];
+
+                fPrescaling[i] = s[i].fPrescaling;
+            }
+        }
+
+    } __attribute__((__packed__));
+
+    struct DimTriggerRates
+    {
+        uint64_t fTimeStamp;
+        uint64_t fOnTimeCounter;
+        uint32_t fTriggerCounter;
+        float    fTriggerRate;
+        float    fBoardRate[40];
+        float    fPatchRate[160];
+
+        DimTriggerRates(const Header &h, const DynamicData &d, const StaticData &s, float rate) :
+            fTimeStamp(h.fTimeStamp), fOnTimeCounter(d.fOnTimeCounter),
+            fTriggerCounter(h.fTriggerCounter), fTriggerRate(rate)
+        {
+            for (int i=0; i<40; i++)
+            {
+                if ((d[i].fOverflow>>4)&1)
+                    fBoardRate[i] = float(UINT32_MAX+1)*2/s[i].fPrescaling;
+                else
+                    fBoardRate[i] = float(d[i].fRateTotal)*2/s[i].fPrescaling;
+
+                // FIXME: Include fCrcError in calculation
+                //fRateOverflow[i] = d[i].fOverflow;
+                for (int j=0; j<4; j++)
+                    if ((d[i].fOverflow>>j)&1)
+                        fPatchRate[i*4+j] = float(UINT32_MAX+1)*2/s[i].fPrescaling;
+                    else
+                        fPatchRate[i*4+j] = float(d[i].fRatePatch[j])*2/s[i].fPrescaling;
             }
         }

trunk/FACT++/src/ftmctrl.cc

@@ -1135 +1135 @@
 
     DimDescribedService fDimPassport;
-    DimDescribedService fDimTriggerCounter;
+    DimDescribedService fDimTriggerRates;
     DimDescribedService fDimError;
     DimDescribedService fDimFtuList;
@@ -1142 +1142 @@
     DimDescribedService fDimCounter;
 
+    uint64_t fTimeStamp;
+    uint32_t fTriggerCounter;
+
     void UpdateFirstHeader()
     {
@@ -1150 +1153 @@
     }
 
+    /*
     void UpdateHeader()
     {
@@ -1159 +1163 @@
         const FTM::DimTriggerCounter data(fHeader);
         fDimTriggerCounter.Update(data);
-    }
+    }*/
 
     void UpdateFtuList()
@@ -1181 +1185 @@
         ConnectionFTM::UpdateDynamicData();
 
-        const FTM::DimDynamicData data(fHeader, fDynamicData);
+        const FTM::DimDynamicData data(fHeader, fDynamicData, fStaticData);
         fDimDynamicData.Update(data);
+
+        float rate = -1;
+        if (fHeader.fTimeStamp>=fTimeStamp && fHeader.fTriggerCounter>=fTriggerCounter)
+        {
+            const uint64_t tdiff = fHeader.fTimeStamp     -fTimeStamp;
+            const uint32_t cdiff = fHeader.fTriggerCounter-fTriggerCounter;
+
+            rate = tdiff==0 ? 0 : 1000000*float(cdiff)/tdiff;
+        }
+
+        fTimeStamp      = fHeader.fTimeStamp;
+        fTriggerCounter = fHeader.fTriggerCounter;
+
+        const FTM::DimTriggerRates rates(fHeader, fDynamicData, fStaticData, rate);
+        fDimTriggerRates.Update(rates);
     }
 
@@ -1214 +1233 @@
         ConnectionFTM(ioservice, imp),
         fDimPassport      ("FTM_CONTROL/PASSPORT",        "X:1;S:1", ""),
-        fDimTriggerCounter("FTM_CONTROL/TRIGGER_COUNTER", "X:1;I:1", ""),
+        fDimTriggerRates  ("FTM_CONTROL/TRIGGER_RATES",   "X:2;I:1;F:1;F:40;F:160", ""),
         fDimError         ("FTM_CONTROL/ERROR",           "X:1;S:1;S:28", ""),
         fDimFtuList       ("FTM_CONTROL/FTU_LIST",        "X:1;X:1;S:1;C:4;X:40;C:40;C:40",  ""),
         fDimStaticData    ("FTM_CONTROL/STATIC_DATA",     "X:1;S:1;S:1;X:1;S:1;S:3;S:1;S:1;S:1;S:1;S:1;S:1;I:1;I:8;S:90;S:160;S:40;S:40", ""),
-        fDimDynamicData   ("FTM_CONTROL/DYNAMIC_DATA",    "X:1;X:1;F:4;I:160;I:40;S:40;S:40;S:1", ""),
-        fDimCounter       ("FTM_CONTROL/COUNTER",         "I:6", "")
+        fDimDynamicData   ("FTM_CONTROL/DYNAMIC_DATA",    "X:1;X:1;F:4;I:160;I:40;S:40;S:40;S:40;S:1", ""),
+        fDimCounter       ("FTM_CONTROL/COUNTER",         "I:6", ""),
+        fTimeStamp(UINT64_MAX),
+        fTriggerCounter(UINT32_MAX)
     {
     }