Changeset 9462 for trunk/MagicSoft/Mars/mtrigger

Timestamp:

06/20/09 10:14:33 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtrigger

Files:

• MTriggerPattern.h (modified) (1 diff)
• MTriggerPatternDecode.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mtrigger/MTriggerPattern.h

@@ -12 +12 @@
 public:
     enum Pattern_t {
-        kTriggerLvl1 = BIT(0), //  1:
-        kCalibration = BIT(1), //  2: Pulse Trigger
-        kTriggerLvl2 = BIT(2), //  4: LUT Pseudo Size selection
-        kPedestal    = BIT(3), //  8:
-        kPinDiode    = BIT(4), // 16:
-        kSumTrigger  = BIT(5)  // 32: Flag for an event taken with sum trigger
-        //kUnused      = BIT(6)
-        //kUnused      = BIT(7)
+//        kUndefined1  = BIT(0), //  1   1: Level 1 from L2 board
+        kTriggerLvl1 = BIT(0), //  1   1: Level 1 from L2 board
+        kCalibration = BIT(1), //  2   2: Pulse Trigger
+        kTriggerLvl2 = BIT(2), //  4   4: LUT Pseudo Size selection
+        kPedestal    = BIT(3), //  8   8: Artificial pedestal event
+        kPinDiode    = BIT(4), // 10  16:
+        kSumTrigger  = BIT(5), // 20  32: Flag for an event taken with sum trigger
+//        kTriggerLvl1 = BIT(6), // 40  64: Trigger lvl1 directly from L1 without going through L2
+        kUndefined1  = BIT(6), // 40  64: Trigger lvl1 directly from L1 without going through L2
+        kUndefined2  = BIT(7)  // 80 128: Undefined?
     };
 

trunk/MagicSoft/Mars/mtrigger/MTriggerPatternDecode.cc

@@ -106 +106 @@
         return kTRUE;
 
-    UInt_t pattern = ~fEvtHeader->GetTriggerID();
+    const UInt_t pattern = ~fEvtHeader->GetTriggerID();
 
     // The the trigger pattern is currently written with inverted bits,
@@ -133 +133 @@
     fPattern->fUnprescaled = (pattern>>8) & 0xff;
 
+    // This is a workaround for the new scheme in which L1TPU (the signal
+    // comming directly from the L1 is connected, but the L1 (routed
+    // over L2 is disconnected)
+    if (!fRunHeader->IsMonteCarloRun() && fRunHeader->GetTelescopeNumber()==1 &&
+        fRunHeader->GetRunNumber()>1006246)
+    {
+        fPattern->fPrescaled   |= (pattern>> 6)&1;
+        fPattern->fUnprescaled |= (pattern>>14)&1;
+    }
+
     return kTRUE;
 }