Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5756)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5757)
@@ -20,4 +20,10 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/01/10 Markus Gaug
+
+   * mcalib/MCalibColorSet.cc
+     - return kFALSE for CL-run instead of kTRUE
+
 
  2005/01/10 Wolfgang Wittek
Index: trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc	(revision 5756)
+++ trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc	(revision 5757)
@@ -416,7 +416,5 @@
               *fLog << "This run has been taken with the continuous light source." << endl;
               *fLog << "It cannot be used for calibration. Try to run a pedestal extraction on it." << endl;
-              fPattern = 0;
-              fIsValid = kTRUE;
-              return kTRUE;
+              return kFALSE;
           }
   }
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 5756)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 5757)
@@ -568,5 +568,5 @@
       if (fPulserColor != MCalibrationCam::kNONE)
         {
-          *fLog << err << "Multiple colours used simultaneously in calibration file. Will reset histograms " 
+          *fLog << warn << "Multiple colours used simultaneously in calibration file. Will reset histograms " 
                 << " and merge the MCalibrationQECam!" << endl;
           fHCam->Finalize();