Changeset 17734

Timestamp:

04/29/14 19:45:34 (11 years ago)

Author:

tbretz

Message:

Fixed the trigger pattern to be consistent with the FACT data.

Location:

trunk/Mars/msimcamera

Files:

• MSimCalibrationSignal.cc (modified) (1 diff)
• MSimTrigger.cc (modified) (1 diff)

trunk/Mars/msimcamera/MSimCalibrationSignal.cc

@@ -246 +246 @@
 
     // Set trigger pattern according to the trigger type
-    const UInt_t p = fRunHeader->IsCalibrationRun() ? MTriggerPattern::kCalibration : MTriggerPattern::kPedestal;
+    const UInt_t p = fRunHeader->IsCalibrationRun() ? 0x100 : 0x400; 
+    //const UInt_t p = fRunHeader->IsCalibrationRun() ? MTriggerPattern::kCalibration : MTriggerPattern::kPedestal;
     fEvtHeader->SetTriggerPattern(~(p | (p<<8)));
     fEvtHeader->SetCalibrationPattern(0/*BIT(16)<<16*/); // CT1 Pulser, see MCalibrationPatternDecode

trunk/Mars/msimcamera/MSimTrigger.cc

@@ -477 +477 @@
     fTrigger->SetReadyToSave();
 
-    // Trigger pattern to be set
-    // FIXME: Make flexible
-    const UInt_t pat = (UInt_t)~(MTriggerPattern::kTriggerLvl1 | (MTriggerPattern::kTriggerLvl1<<8));
-
     // Flag this event as triggered by the lvl1 trigger (FIXME?)
-    fEvtHeader->SetTriggerPattern(pos<0 ? 0 : pat);
+    fEvtHeader->SetTriggerPattern(pos<0 ? 0 : 4);
     fEvtHeader->SetNumTrigLvl1((UInt_t)idx);
     fEvtHeader->SetReadyToSave();