Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 5137)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 5156)
@@ -1,2 +1,3 @@
+
 /* ======================================================================== *\
 !
@@ -955,7 +956,7 @@
   if (cal.GetMean() < fChargeLimit*cal.GetPedRms())
     {
-      *fLog << warn << GetDescriptor() 
-            << Form(": Fitted Charge: %5.2f is smaller than %2.1f",cal.GetMean(),fChargeLimit)
-            << Form("  Pedestal RMS: %5.2f in %s%4i",cal.GetPedRms(),what,cal.GetPixId()) << endl;
+      *fLog << warn
+            << Form("Fitted Charge: %5.2f < %2.1f",cal.GetMean(),fChargeLimit)
+            << Form(" * Pedestal RMS %5.2f in %s%3i",cal.GetPedRms(),what,cal.GetPixId()) << endl;
       bad.SetUncalibrated( MBadPixelsPix::kChargeIsPedestal);
     }
@@ -963,7 +964,7 @@
    if (cal.GetMean() < fChargeRelErrLimit*cal.GetMeanErr()) 
     {
-      *fLog << warn << GetDescriptor() 
-            << Form(": Fitted Charge: %4.2f is smaller than %2.1f",cal.GetMean(),fChargeRelErrLimit) 
-            << Form(" times its error: %4.2f in %s%4i",cal.GetMeanErr(),what,cal.GetPixId()) << endl;
+      *fLog << warn
+            << Form("Fitted Charge: %4.2f < %2.1f",cal.GetMean(),fChargeRelErrLimit)
+            << Form(" * its error %4.2f in %s%3i",cal.GetMeanErr(),what,cal.GetPixId()) << endl;
       bad.SetUncalibrated( MBadPixelsPix::kChargeRelErrNotValid );
     }
@@ -971,7 +972,7 @@
   if (cal.GetSigma() < cal.GetPedRms())
     {
-      *fLog << warn << GetDescriptor() 
-            << Form(": Sigma of Fitted Charge: %6.2f is smaller than",cal.GetSigma())
-	    << Form(" Ped. RMS: %5.2f in %s%4i",cal.GetPedRms(),what,cal.GetPixId()) << endl;
+      *fLog << warn
+            << Form("Sigma of Fitted Charge: %6.2f <",cal.GetSigma())
+	    << Form(" Ped. RMS=%5.2f in %s%3i",cal.GetPedRms(),what,cal.GetPixId()) << endl;
       bad.SetUncalibrated( MBadPixelsPix::kChargeSigmaNotValid );
       return kFALSE;
@@ -980,6 +981,6 @@
   if (!cal.CalcReducedSigma())
     {
-      *fLog << warn << GetDescriptor() 
-            << Form(": Could not calculate the reduced sigma in %s:               ",what)
+      *fLog << warn 
+            << Form("Could not calculate the reduced sigma in %s:               ",what)
             << Form("         %4i",cal.GetPixId()) 
             << endl;
@@ -990,6 +991,6 @@
   if (!cal.CalcFFactor())
     {
-      *fLog << warn << GetDescriptor() 
-            << Form(": Could not calculate the F-Factor in %s:                    ",what)
+      *fLog << warn 
+            << Form("Could not calculate the F-Factor in %s:                    ",what)
             << Form("         %4i",cal.GetPixId()) 
             << endl;
@@ -1000,6 +1001,6 @@
   if (!cal.CalcConvFFactor())
     {
-      *fLog << warn << GetDescriptor() 
-            << Form(": Could not calculate the Conv. FADC counts to Phes in %s:  ",what)
+      *fLog << warn 
+            << Form("Could not calculate the Conv. FADC counts to Phes in %s:  ",what)
             << Form("         %4i",cal.GetPixId()) 
             << endl;
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc	(revision 5137)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc	(revision 5156)
@@ -418,7 +418,7 @@
       if ( res < lowlim[aidx] || res > upplim[aidx] )
         {
-          *fLog << warn << GetDescriptor() << ": Deviating time resolution: " 
-            << Form("%4.2f",res) << " out of accepted limits: [" 
-                << Form("%4.2f%s%4.2f",lowlim[aidx],",",upplim[aidx]) << "] in pixel " << i << endl;
+          *fLog << warn << "Deviating time resolution: "
+            << Form("%4.2f",res) << " out of accepted limits ["
+                << Form("%4.2f,%4.2f",lowlim[aidx],upplim[aidx]) << "] in pixel " << i << endl;
           bad.SetUncalibrated( MBadPixelsPix::kDeviatingTimeResolution);
           pix.SetExcluded();