Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 6527)
+++ trunk/MagicSoft/Mars/Changelog	(revision 6528)
@@ -54,4 +54,13 @@
    * mhist/MHCamEvent.cc:
      - replaced the warn in SetupFill by an inf
+
+   * mhcalib/MHCalibrationCam.cc, mhcalib/MHCalibrationHiLoCam.cc,
+     mhcalib/MHCalibrationChargePINDiode.cc:
+     - removed obsolete output after a failed FindCreateObj (the
+       function itself does the output in case of failure)
+
+   * mhcalib/MHCalibrationCam.cc:
+     - replaced 'err' by 'warn' for under-/overflow in lo-gain pixel,
+       it doesn't result in an fatal error (abort)
 
 
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc	(revision 6527)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc	(revision 6528)
@@ -1198,5 +1198,5 @@
     {
       *fLog << warn << GetDescriptor()
-	    << ": Only overflow or underflow in high-gain pixel: " << pix.GetPixId() << endl;
+	    << ": Only overflow or underflow in hi-gain pixel: " << pix.GetPixId() << endl;
       return;
     }  
@@ -1281,6 +1281,6 @@
   if (hist.IsEmpty() || hist.IsOnlyOverflow() || hist.IsOnlyUnderflow())
     {
-      *fLog << err << GetDescriptor()
-	    << ": Only overflow or underflow in low-gain pixel: " << pix.GetPixId() << endl;
+      *fLog << warn << GetDescriptor()
+	    << ": Only overflow or underflow in lo-gain pixel: " << pix.GetPixId() << endl;
       return;
     }  
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.cc	(revision 6527)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.cc	(revision 6528)
@@ -206,15 +206,9 @@
   fSigPIN = (MExtractedSignalPINDiode*)pList->FindCreateObj("MExtractedSignalPINDiode");
   if (!fSigPIN)
-  {
-      *fLog << err << "MExtractedSignalPINDiode not found... aborting " << endl;
       return kFALSE;
-  }
 
   fPINDiode = (MCalibrationChargePINDiode*)pList->FindCreateObj("MCalibrationChargePINDiode");
   if (!fPINDiode)
-  {
-      *fLog << err << "MCalibrationChargePINDiode not found... aborting " << endl;
       return kFALSE;
-  }
 
   return kTRUE;
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc	(revision 6527)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc	(revision 6528)
@@ -239,8 +239,5 @@
       fCam = (MCalibrationCam*)pList->FindCreateObj(AddSerialNumber("MCalibrationHiLoCam"));
       if (!fCam)
-	{
-	  *fLog << err << "Cannot find nor create MCalibrationHiLoCam... abort." << endl;
 	  return kFALSE;
-	}
       fCam->Init(*fGeom);
     }