Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3479)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3480)
@@ -64,4 +64,8 @@
      - use two loops over pixels in order to determine mean flux of phe;s to 
        discard pixels far outside the normal distribution
+
+   * mcalib/MCalibrate.cc
+     - added case that no MBadPixelsCam is available.
+
 
  2004/03/10: Abelardo Moralejo
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrate.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3479)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3480)
@@ -99,4 +99,5 @@
 //  - MCalibrationChargeCam
 //  - MExtractedSignalCam
+//  - MBadPixelsCam
 //
 // The following output containers are also searched and created if
@@ -117,12 +118,8 @@
 
     fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
-
     if (!fBadPixels)
-    {
-      *fLog << err << AddSerialNumber("MBadPixelsCam") << " not found ... aborting" << endl;
-        return kFALSE;
-    }
-
-   if(fCalibrationMode>kNone)
+      *fLog << warn << AddSerialNumber("MBadPixelsCam") << " not found ... no action" << endl;
+    
+    if(fCalibrationMode>kNone)
       {
 
@@ -228,10 +225,12 @@
 	{
 
-	  MCalibrationChargePix &pix = (*fCalibrations)[pixidx];       
+	  
+	  MCalibrationChargePix &pix = (*fCalibrations)[pixidx];
 	  MBadPixelsPix         &bad = (*fBadPixels)[pixidx];
 
-          if (!bad.IsCalibrationResultOK())
-            continue;
-	  
+          if (fBadPixels)
+            if (!bad.IsCalibrationResultOK())
+              continue;
+
 	  switch(fCalibrationMode)
 	    {