Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 3437)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 3445)
@@ -348,9 +348,9 @@
 
       if (bad.IsBad())
-        {
+      {
           pix.SetExcluded();
           continue;
-        }
-      
+      }
+
       pix.SetAbsTimeBordersHiGain(fSignals->GetFirstUsedSliceHiGain(),
                                   fSignals->GetLastUsedSliceHiGain());
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc	(revision 3437)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc	(revision 3445)
@@ -241,5 +241,5 @@
     if (!fRawEvt)
     {
-      *fLog << err << dbginf << "MRawEvtData not found... aborting." << endl;
+      *fLog << err << "MRawEvtData not found... aborting." << endl;
       return kFALSE;
     }
@@ -248,5 +248,5 @@
   if (!fSignal)
   {
-      *fLog << err << GetDescriptor() << ": ERROR: Could not find MExtractedSignalBlindPixel ... aborting " << endl;
+      *fLog << err << "MExtractedSignalBlindPixel not found... aborting " << endl;
       return kFALSE;
   }
@@ -262,8 +262,5 @@
   fBlindPix = (MCalibrationChargeBlindPix*)pList->FindCreateObj("MCalibrationChargeBlindPix");
   if (!fBlindPix)
-  {
-      *fLog << err << GetDescriptor() << ": ERROR: Could not find MCalibrationChargeBlindPix ... aborting " << endl;
-      return kFALSE;
-  }
+      return kFALSE;
 
   return kTRUE;
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc	(revision 3437)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc	(revision 3445)
@@ -275,16 +275,14 @@
   
   fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData");
-
   if (!fRawEvt)
   {
-      gLog << err << dbginf << "MRawEvtData not found... aborting." << endl;
+      *fLog << err << dbginf << "MRawEvtData not found... aborting." << endl;
       return kFALSE;
   }
 
   fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
-
   if (!fGeom)
   {
-      gLog << err << dbginf << "MGeomCam not found... aborting." << endl;
+      *fLog << err << "MGeomCam not found... aborting." << endl;
       return kFALSE;
   }
@@ -306,23 +304,17 @@
   fBadPixels = (MBadPixelsCam*)pList->FindCreateObj("MBadPixelsCam");
   if (!fBadPixels)
+      return kFALSE;
+
+
+  fCam = (MCalibrationChargeCam*)pList->FindCreateObj("MCalibrationChargeCam");
+  if (!fCam)
+      return kFALSE;
+
+  MExtractedSignalCam *signal = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
+  if (!signal)
   {
-      gLog << err << GetDescriptor() << ": ERROR: Could not find MBadPixelsCam ... aborting " << endl;
+      *fLog << err << "MExtractedSignalCam not found... abort." << endl;
       return kFALSE;
   }
-
-
-  fCam = (MCalibrationChargeCam*)pList->FindCreateObj("MCalibrationChargeCam");
-  if (!fCam)
-  {
-      gLog << err << GetDescriptor() << ": ERROR: Could not find MCalibrationChargeCam ... aborting " << endl;
-      return kFALSE;
-  }
-
-  MExtractedSignalCam *signal = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
-  if (!signal)
-    {
-      gLog << err << "No argument in MExtractedSignalCam::ReInit... abort." << endl;
-      return kFALSE;
-    }
 
   const Int_t n = signal->GetSize();
@@ -382,5 +374,5 @@
   if (!signal)
     {
-      gLog << err << "No argument in MExtractedSignalCam::Fill... abort." << endl;
+      *fLog << err << "No argument in MExtractedSignalCam::Fill... abort." << endl;
       return kFALSE;
     }
@@ -390,5 +382,5 @@
   if (fHiGainArray->GetEntries() != n)
     {
-      gLog << err << "ERROR - Size mismatch... abort." << endl;
+      *fLog << err << "ERROR - Size mismatch... abort." << endl;
       return kFALSE;
     }
@@ -396,5 +388,5 @@
   if (fLoGainArray->GetEntries() != n)
     {
-      gLog << err << "ERROR - Size mismatch... abort." << endl;
+      *fLog << err << "ERROR - Size mismatch... abort." << endl;
       return kFALSE;
     }
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc	(revision 3437)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc	(revision 3445)
@@ -134,5 +134,5 @@
   if (!fPINDiode)
   {
-      *fLog << err << GetDescriptor() << ": ERROR: Could not find MCalibrationChargePINDiode ... aborting " << endl;
+      *fLog << err << "MCalibrationChargePINDiode not found... aborting " << endl;
       return kFALSE;
   }
@@ -163,5 +163,5 @@
   if (fExtractSlices != 0. && slices != fExtractSlices )
     {
-      gLog << err << "Number of used signal slices changed in MExtractedSignalCam  ... abort." 
+      *fLog << err << "Number of used signal slices changed in MExtractedSignalCam  ... abort."
            << endl;
       return kFALSE;