Changeset 6056 for trunk/MagicSoft/Mars

Timestamp:

01/27/05 18:20:16 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationPatternDecode.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationPatternDecode.cc

@@ -109 +109 @@
     fPattern->fCLColor    = (MCalibrationPattern::CLColor_t)((pattern>>8)&0xf);
     
-    const UInt_t pulserpattern = (pattern >> 16) & 0x1ffff;
+    const UInt_t pulserpattern = (pattern >> 16) & 0xffff;
 
-    fPattern->fPulserStrength =  MCalibrationCam::kNONE;    
+    fPattern->fPulserColor =  MCalibrationCam::kNONE;    
 
     if ((pulserpattern & kGreenAndBlue) || (pulserpattern & kBlueAndUV) || (pulserpattern & kGreenAndUV))
@@ -131 +131 @@
         break;
       case MCalibrationCam::kGREEN:
-        if (pattern & kSlot1Green)
+        if (pulserpattern & kSlot1Green)
           strength += 5.;
-        if (pattern & kSlot2Green)
+        if (pulserpattern & kSlot2Green)
           strength += 2.;
-        if (pattern & kSlot15Green)
+        if (pulserpattern & kSlot15Green)
           strength += 1.;
-        if (pattern & kSlot16AttGreen)
+        if (pulserpattern & kSlot16AttGreen)
           strength += 0.2;
         break;      
       case MCalibrationCam::kBLUE:
-        if (pattern & kSlot3Blue)
-          strength += 5.;
-        if (pattern & kSlot6Blue)
-          strength += 5.;
-        if (pattern & kSlot7Blue)
-          strength += 5.;
-        if (pattern & kSlot8Blue)
+        if (pulserpattern & kSlot3Blue)
+          strength += 5.1;
+        if (pulserpattern & kSlot6Blue)
+          strength += 5.2;
+        if (pulserpattern & kSlot7Blue)
+          strength += 5.4;
+        if (pulserpattern & kSlot8Blue)
           strength += 2.;
-        if (pattern & kSlot9AttBlue)
-          strength += 0.2;
-        if (pattern & kSlot10Blue)
+        if (pulserpattern & kSlot9AttBlue)
+          strength += 0.25;
+        if (pulserpattern & kSlot10Blue)
           strength += 0.;
-        if (pattern & kSlot11Blue)
+        if (pulserpattern & kSlot11Blue)
           strength += 1.;
-        if (pattern & kSlot14Blue)
-          strength += 5.;
+        if (pulserpattern & kSlot14Blue)
+          strength += 5.8;
         break;      
       case MCalibrationCam::kUV:
-        if (pattern & kSlot4UV)
+        if (pulserpattern & kSlot4UV)
           strength += 1.;
-        if (pattern & kSlot5UV)
+        if (pulserpattern & kSlot5UV)
           strength += 2.;
-        if (pattern & kSlot12UV)
-          strength += 5.;
-        if (pattern & kSlot13UV)
-          strength += 5.;
-      break;      
+        if (pulserpattern & kSlot12UV)
+          strength += 5.1;
+        if (pulserpattern & kSlot13UV)
+          strength += 5.2;
+        break;      
       case MCalibrationCam::kCT1:
         strength = 20.;