Changeset 5758 for trunk/MagicSoft

Timestamp:

01/10/05 10:15:24 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationChargeCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
      - return kFALSE for CL-run instead of kTRUE
 
+   * mcalib/MCalibrationChargeCalc.cc
+     - stop program in case that multiple colours are found in same file
+       without intensity calibration
 
  2005/01/10 Wolfgang Wittek

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -568 +568 @@
       if (fPulserColor != MCalibrationCam::kNONE)
         {
-          *fLog << warn << "Multiple colours used simultaneously in calibration file. Will reset histograms " 
-                << " and merge the MCalibrationQECam!" << endl;
+          *fLog << err << "Multiple colours used simultaneously in calibration file.";
+          *fLog << "Use Intenstiy Calibration for this case! " << endl;
+          return kFALSE;
+          /*          
           fHCam->Finalize();
           fHBlindCam->Finalize();
@@ -575 +577 @@
           fHBlindCam->ResetHists();
           Finalize();
+          */
         }
     }