Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5757)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5758)
@@ -26,4 +26,7 @@
      - 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
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 5757)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 5758)
@@ -568,6 +568,8 @@
       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,4 +577,5 @@
           fHBlindCam->ResetHists();
           Finalize();
+          */
         }
     }