Changeset 4009 for trunk/MagicSoft

Timestamp:

05/07/04 15:25:32 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
  2004/05/07: Markus Gaug
+
+   * mjobs/MJCalibration.cc
+     - take runs 20660 and 20661 into the list of known runs with colour
+       green.
 
    * mpedestal/MPedCalcPedRun.[h,cc]

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -700 +700 @@
       filenames.ToLower();
 
+      //
+      // Here starts the list of runs where the shifters did not put 
+      // a colour, but which have been found out by other means
+      //
+      if (filenames.Contains("_20660_"))
+        if (fColor == MCalibrationCam::kNONE)
+          {
+            *fLog << "Found colour: kGREEN  in " << filenames << endl;
+            fColor = MCalibrationCam::kGREEN;
+          }
+        else if (fColor != MCalibrationCam::kGREEN)
+          {
+            *fLog << err << "Different colour found in " << filenames << "... abort" << endl;
+            return kFALSE;
+          }
+
+      if (filenames.Contains("_20661_"))
+        if (fColor == MCalibrationCam::kNONE)
+          {
+            *fLog << "Found colour: kGREEN  in " << filenames << endl;
+            fColor = MCalibrationCam::kGREEN;
+          }
+        else if (fColor != MCalibrationCam::kGREEN)
+          {
+            *fLog << err << "Different colour found in " << filenames << "... abort" << endl;
+            return kFALSE;
+          }
+
+      //
+      // Here start the runs where the shifter put 
+      // the colour
+      //
       if (filenames.Contains("green"))
         if (fColor == MCalibrationCam::kNONE)