Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 3724)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 3725)
@@ -272,5 +272,5 @@
   SetLambdaErrLimit();
   SetPheErrLimit();
-  SetPulserColor(MCalibrationCam::kCT1);
+  SetPulserColor(MCalibrationCam::kNONE);
 
   Clear();
@@ -342,4 +342,17 @@
   
   fEvtTime = (MTime*)pList->FindObject("MTime");
+
+  //
+  // Check the pulser colour --> FIXME: this solution is only valid until the arrival of the DM's
+  //
+  if (fPulserColor == MCalibrationCam::kNONE)
+    {
+      *fLog << endl;
+      *fLog << err << GetDescriptor()
+            << ": No Pulser colour has been chosen. Since the installation of the IFAE pulser box,"
+            << " you HAVE to provide the LEDs colour, otherwise there is no calibration. " << endl;
+      *fLog << "See e.g. the macro calibration.C " << endl;
+      return kFALSE;
+    }
   
   return kTRUE;