Changeset 11188 for trunk

Timestamp:

06/24/11 17:38:02 (13 years ago)

Author:

tbretz

Message:

Also update status informations when connection information has changed in the meantime.

File:

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

trunk/FACT++/src/EventBuilderWrapper.h

@@ -949 +949 @@
         case kDebug: file = new DataFileDebug(runid); break;
         case kFits:  file = new DataFileFits(runid);  break;
-        case kRaw:   file = new DataFileRaw(runid);   break;
+        case kRaw:   file = new DataFileNone(runid);  break;
         }
 
@@ -1088 +1088 @@
         //
         if (!fDebugRead || ibyte==0)
-            return;
+            return;
 
         if (!fDumpRead.is_open())
@@ -1453 +1453 @@
     }
 
+    vector<uint> fNumConnected;
+
     void debugHead(int socket, const FAD::EventHeader &h)
     {
@@ -1459 +1461 @@
             return;
 
-        const FAD::EventHeader old = fVecHeader[id];
-
+        if (fNumConnected.size()!=40)
+            fNumConnected.resize(40);
+
+        vector<uint> con(gi_NumConnect, gi_NumConnect+40);
+
+        bool changed = con!=fNumConnected;
+
+        fNumConnected = con;
+
+
+        const FAD::EventHeader old = fVecHeader[id];
         fVecHeader[id] = h;
 
-        if (old.fVersion != h.fVersion)
+        if (old.fVersion != h.fVersion || changed)
         {
             const pair<bool, boost::array<uint16_t,43>> ver = Compare(&h, &h.fVersion);
@@ -1494 +1505 @@
          */
 
-        if (old.fTriggerType != h.fTriggerType)
+        if (old.fTriggerType != h.fTriggerType || changed)
         {
             const pair<bool, boost::array<uint16_t,43>> typ = Compare(&h, &h.fTriggerType);
@@ -1500 +1511 @@
         }
 
-        if (old.fRunNumber != h.fRunNumber)
+        if (old.fRunNumber != h.fRunNumber || changed)
         {
             const pair<bool, boost::array<uint32_t,43>> run = Compare(&h, &h.fRunNumber);
@@ -1506 +1517 @@
         }
 
-        if (old.fDNA != h.fDNA)
+        if (old.fDNA != h.fDNA || changed)
         {
             const pair<bool, boost::array<uint64_t,43>> dna = Compare(&h, &h.fDNA);
@@ -1513 +1524 @@
         }
 
-        if (old.fStatus != h.fStatus)
+        if (old.fStatus != h.fStatus || changed)
         {
             const boost::array<uint16_t,42> sts = CompareBits(&h, &h.fStatus);
             fDimStatus.setData(const_cast<uint16_t*>(sts.data()), 42*sizeof(uint16_t));
             fDimStatus.updateService();
-        }
+        }
     }
 };
@@ -1544 +1555 @@
     void factOut(int severity, int err, const char *message)
     {
-        EventBuilderWrapper::This->factOut(severity, err, message);
+        if (severity!=99)
+            EventBuilderWrapper::This->factOut(severity, err, message);
     }