Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5876)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5877)
@@ -75,4 +75,9 @@
    * callisto.rc
      - fixed default weights files for pedestal extraction for cosmcis
+
+   * mcalib/MCalibrationChargeCalc.cc
+     - removed program exit on occurrance of multiple colours without 
+       intensity calibration
+
 
  2005/01/17 Nadia Tonello and Markus Gaug
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 5876)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 5877)
@@ -605,14 +605,22 @@
       if (fPulserColor != MCalibrationCam::kNONE)
         {
-          *fLog << err << "Multiple colours used simultaneously in calibration file.";
-          *fLog << "Use Intenstiy Calibration for this case! " << endl;
-          return kFALSE;
-          /*          
+          *fLog << warn << GetDescriptor()
+                << "Multiple colours used simultaneously!" ;
           fHCam->Finalize();
           fHBlindCam->Finalize();
+
+          Finalize();
+
           fHCam->ResetHists();
           fHBlindCam->ResetHists();
-          Finalize();
-          */
+
+          *fLog << inf << "Starting next calibration... " << flush;
+
+          fHCam->SetColor(col);
+          fHBlindCam->SetColor(col);
+
+          fCam->SetPulserColor(col);
+          if (fBlindCam)
+            fBlindCam->SetPulserColor(col);
         }
     }
@@ -633,4 +641,7 @@
   *fLog << inf << " with strength: " << fEvtHeader->GetPulserStrength() << endl;
   
+  fHCam->SetColor(col);
+  fHBlindCam->SetColor(col);
+
   if (fPINDiode)
     fPINDiode->SetColor( fPulserColor );