Changeset 9329 for trunk/MagicSoft/Mars/mcalib

Timestamp:

02/12/09 20:14:44 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationPatternDecode.cc (modified) (1 diff)
• MCalibrationPatternDecode.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationPatternDecode.cc

@@ -115 +115 @@
     fPattern->fPulserColor =  MCalibrationCam::kNONE;
 
+    // This is a MC workaround because the CT1 bit cannot be set
+    // It would be bit 33 in the pattern which simple
+    // doesn't exist in a 32 bit integer.
+    if (fRunHeader->IsMonteCarloRun() && pat==0)
+        fPattern->fPulserColor =  MCalibrationCam::kCT1;
+
     // Check the pattern
     if ((pat & kGreenAndBlue) || (pat & kBlueAndUV) || (pat & kGreenAndUV))
         fPattern->fPulserColor =  MCalibrationCam::kNONE;
 
-    if (pat & kCT1Pulser)
-        fPattern->fPulserColor =  MCalibrationCam::kCT1;
+    // FIXME: This condition can never be true!
+    //if (pat & kCT1Pulser)
+    //    fPattern->fPulserColor =  MCalibrationCam::kCT1;
 
     if (pat & kAnyUV)

trunk/MagicSoft/Mars/mcalib/MCalibrationPatternDecode.h

@@ -33 +33 @@
         kSlot15Green    = BIT(14),
         kSlot16AttGreen = BIT(15),
-        kCT1Pulser      = BIT(16),
+//        kCT1Pulser      = BIT(16),
         kAnyGreen       = kSlot1Green  | kSlot2Green | kSlot15Green | kSlot16AttGreen,
         kAnyUV          = kSlot4UV     | kSlot5UV    | kSlot12UV    | kSlot13UV,
@@ -41 +41 @@
         kBlueAndUV      = kAnyBlue  & kAnyUV,
         kGreenAndUV     = kAnyGreen & kAnyUV,
-        kIFAEPulser     = kAnyGreen | kAnyBlue | kAnyUV,
-        kAny            = kAnyGreen | kAnyBlue | kAnyUV | kCT1Pulser
+        kIFAEPulser     = kAnyGreen | kAnyBlue | kAnyUV/*,
+        kAny            = kAnyGreen | kAnyBlue | kAnyUV | kCT1Pulser*/
       };