Index: trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc	(revision 2873)
+++ trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc	(revision 2876)
@@ -73,4 +73,6 @@
     fADC2PhOuter = 1.;
 
+    fFillCalibrationCam = kTRUE;
+
 }
 
@@ -117,9 +119,21 @@
     return kTRUE;
 
-  fCalCam = (MCalibrationCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationCam"));
+
+  fCalCam = (MCalibrationCam*) pList->FindObject(AddSerialNumber("MCalibrationCam"));
   if ( !fCalCam )
     {
-      *fLog << err << dbginf << "Cannot create MCalibrationCam... aborting." << endl;
-      return kFALSE;
+      *fLog << warn << dbginf << AddSerialNumber("MCalibrationCam") << " does not exist... Creating." << endl;
+
+      fCalCam = (MCalibrationCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationCam"));
+      if ( !fCalCam )
+	{
+	  *fLog << err << dbginf << "Cannot create " << AddSerialNumber("MCalibrationCam") << "... aborting." << endl;
+	  return kFALSE;
+	}
+    }
+  else
+    {
+      fFillCalibrationCam = kFALSE;
+      *fLog << warn << dbginf << AddSerialNumber("MCalibrationCam") << " already exists... " << endl;
     }
 
@@ -185,4 +199,13 @@
     fConversionHiLo = fHeaderFadc->GetLow2HighGain();
 
+    //
+    // If MCalibrationCam already existed in the parameter list before
+    // MMcCalibrationUpdate::PreProcess was executed (from a 
+    // previous calibration loop) we must not fill it, hence nothing
+    // else has to be done in ReInit:
+    //
+    if ( !fFillCalibrationCam )
+      return kTRUE;
+
 
     const int num = fCalCam->GetSize();
Index: trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h	(revision 2873)
+++ trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h	(revision 2876)
@@ -30,4 +30,6 @@
     Float_t fConversionHiLo;
 
+    Bool_t  fFillCalibrationCam;
+
 public:
     MMcCalibrationUpdate(const char *name=NULL, const char *title=NULL);