Changeset 11651 for trunk

Timestamp:

07/27/11 14:03:47 (13 years ago)

Author:

tbretz

Message:

Renamed TriggerId to TriggerCounter

Location:

trunk/FACT++/src

Files:

• EventBuilderWrapper.h (modified) (2 diffs)
• HeadersFAD.cc (modified) (2 diffs)
• HeadersFAD.h (modified) (2 diffs)
• fad.cc (modified) (1 diff)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -1377 +1377 @@
         const array<uint16_t,2> roi = {{ event->Roi, event->RoiTM }};
 
-        if (roi!=fVecRoi)
+        if (roi!=fVecRoi)
+        {
             Update(fDimRoi, roi);
+            fVecRoi = roi;
+        }
 
         const FAD::EventHeader *beg = reinterpret_cast<FAD::EventHeader*>(fadhd);
@@ -1386 +1389 @@
         {
             // Event incomplete
-            if (ptr->fStartDelimiter==0)
-                return -1;
+            //if (ptr->fStartDelimiter==0)
+            //    return -1;
 
                 // Either one of

trunk/FACT++/src/HeadersFAD.cc

@@ -21 +21 @@
     out << "Time:       " << setprecision(3) << fixed << fTimeStamp/10000. << "s" << endl;
     out << "EvtCounter: " << fEventCounter << " of " << fNumTriggersToGenerate << endl;
-    out << "Trigger:    Type=" << fTriggerType << " Id=" << fTriggerId << " Crc=0x" << hex << fTriggerCrc << endl;
+    out << "Trigger:    Type=" << fTriggerType << " Counter=" << fTriggerCounter << " Crc=0x" << hex << fTriggerCrc << endl;
 
     out << "RefClock:   " << dec << fFreqRefClock << endl;
@@ -63 +63 @@
     out << "  Busy enabled:              ";
     if (HasBusyOn())
-        out << "continously enabled" << endl;
+        out << "constantly enabled" << endl;
     else
-        out << (HasBusyOff()?"continously disabled":"normal") << endl;
+        out << (HasBusyOff()?"constantly disabled":"normal") << endl;
     out << "  Trigger line enabled:      " << (HasTriggerEnabled()?"enabled":"disabled") << endl;
     out << "  Continous trigger enabled: " << (HasContTriggerEnabled()?"enabled":"disabled") << endl;

trunk/FACT++/src/HeadersFAD.h

@@ -169 +169 @@
         uint16_t fTriggerCrc;          // Receiver timeout / CRC ; 1 byte each
         uint16_t fTriggerType;
-        uint32_t fTriggerId;
+        uint32_t fTriggerCounter;
         //
         uint32_t fEventCounter;
@@ -204 +204 @@
             Reverse(&fEventCounter);
 
-            Reverse(((uint16_t*)fTriggerId));
-            Reverse(((uint16_t*)fTriggerId)+1);
-
-            Reverse(&fTriggerId);
+            Reverse(((uint16_t*)fTriggerCounter));
+            Reverse(((uint16_t*)fTriggerCounter)+1);
+
+            Reverse(&fTriggerCounter);
 
             Reverse(((uint16_t*)fFreqRefClock));

trunk/FACT++/src/fad.cc

@@ -129 +129 @@
         fHeader.fPackageLength = sizeof(EventHeader)/2+1;
         fHeader.fEventCounter++;
-        fHeader.fTriggerId = triggerid;
+        fHeader.fTriggerCounter = triggerid;
         fHeader.fTimeStamp = uint32_t((Time(Time::utc).UnixTime()-fStartTime)*10000);
         fHeader.fFreqRefClock = 997+rand()/(RAND_MAX/7);