Index: /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc	(revision 5054)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc	(revision 5055)
@@ -48,4 +48,5 @@
 
 #include "MParList.h"
+#include "MTaskList.h"
 
 #include "MHCalibrationCam.h"
@@ -115,4 +116,11 @@
     }
 
+  MTaskList *tlist = (MTaskList*)pList->FindObject("MTaskList");
+  if (!tlist)
+    {
+      *fLog << err << "MTaskList not found... abort." << endl;
+      return kFALSE;
+    }
+
   // 
   // Look for the MBadPixels Intensity Cam
@@ -120,6 +128,5 @@
   fIntensBad = (MBadPixelsIntensityCam*)pList->FindCreateObj("MBadPixelsIntensityCam");
 
-  *fLog << inf << GetDescriptor() 
-        << ": Found MBadPixelsIntensityCam ... " << endl;
+  *fLog << inf << "Found MBadPixelsIntensityCam ... " << flush;
   // 
   // Look for the MCalibrationIntensityBlindCam
@@ -127,6 +134,5 @@
   fIntensBlind = (MCalibrationIntensityBlindCam*)pList->FindCreateObj("MCalibrationIntensityBlindCam");
 
-  *fLog << inf << GetDescriptor() 
-        << ": Found MCalibrationIntensityBlindCam ... " << endl;
+  *fLog << inf << "Found MCalibrationIntensityBlindCam ... " << flush;
 
   // 
@@ -134,13 +140,13 @@
   // corresponding IntensityCam
   //
-  if (pList->FindObject(AddSerialNumber("FillChargeCam")))
+  if (pList->FindObject(AddSerialNumber("MHCalibrationChargeCam")))
   {
 
     fIntensCharge = (MCalibrationIntensityChargeCam*)pList->FindCreateObj("MCalibrationIntensityChargeCam");
     fIntensQE     = (MCalibrationIntensityQECam*)    pList->FindCreateObj("MCalibrationIntensityQECam");
-    fChargeCalc   = (MCalibrationChargeCalc*)        pList->FindObject("MCalibrationChargeCalc");
-
-    *fLog << inf << GetDescriptor() 
-          << ": Found MHCalibrationChargeCam ... " << endl;
+
+    fChargeCalc   = (MCalibrationChargeCalc*)tlist->FindObject("MCalibrationChargeCalc");
+
+    *fLog << inf << " Found MHCalibrationChargeCam ... " << endl;
 
     if (!fIntensCharge)
@@ -167,9 +173,9 @@
   // corresponding IntensityCam
   //
-  if (pList->FindObject(AddSerialNumber("FillRelTimeCam")))
+  if (pList->FindObject(AddSerialNumber("MHCalibrationRelTimeCam")))
   {
 
     fIntensRelTime = (MCalibrationIntensityRelTimeCam*)pList->FindCreateObj("MCalibrationIntensityRelTimeCam");
-    fRelTimeCalc   = (MCalibrationRelTimeCalc*)        pList->FindObject(AddSerialNumber("MCalibrationRelTimeCalc"));
+    fRelTimeCalc   = (MCalibrationRelTimeCalc*)tlist->FindObject(AddSerialNumber("MCalibrationRelTimeCalc"));
 
     *fLog << inf << GetDescriptor()