Changeset 12007 for trunk/FACT++

Timestamp:

09/07/11 14:48:48 (13 years ago)

Author:

tbretz

Message:

Updated decoding of trigger type pattern.

File:

• trunk/FACT++/src/HeadersFAD.h (modified) (3 diffs)

trunk/FACT++/src/HeadersFAD.h

@@ -117 +117 @@
         enum TriggerType
         {
-            kLPext    = 0x001,
-            kLPint    = 0x002,
-            kPedestal = 0x004,
-            kLPset    = 0x078,
-            kTIM      = 0x080,
-            kExt1     = 0x100,
-            kExt2     = 0x200,
+            kLPext    = 0x0100,
+            kLPint    = 0x0200,
+            kPedestal = 0x0400,
+            kLPset    = 0x7800,
+            kTIM      = 0x8000,
+
+            kExt1     = 0x0001,
+            kExt2     = 0x0002,
             kAll      = kLPext|kLPint|kTIM|kPedestal|kExt1|kExt2
         };
@@ -322 +323 @@
         bool IsInSock17Mode() const    { return fStatus&kSock17; }
 
-        int  GetTriggerLogic() const { return fTriggerType>>10; }
+        int  GetTriggerLogic() const { return (fTriggerType>>8)0x3f; }
         bool HasTriggerExt1() const  { return fTriggerType&kExt1; }
         bool HasTriggerExt2() const  { return fTriggerType&kExt2; }
@@ -329 +330 @@
         bool HasTriggerLPint() const { return fTriggerType&kLPint; }
         bool IsTriggerPhys() const   { return !(fTriggerType&kAll); }
-        int  GetTriggerLPset() const { return (fTriggerType&kLPset)>>3; }
+        int  GetTriggerLPset() const { return (fTriggerType&kLPset)>>11; }
 
         uint16_t Crate() const { return fBoardId>>8; }