Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 7017)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 7023)
@@ -984,7 +984,8 @@
   if (cal.GetSigma() < cal.GetPedRms())
     {
-      *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;
+      *fLog << warn << "Sigma of Fitted Charge: "
+            << Form("%6.2f <",cal.GetSigma()) << " Ped. RMS="
+            << Form("%5.2f", cal.GetPedRms()) << " in " << what
+	    << Form("%3i",cal.GetPixId()) << endl;
       bad.SetUncalibrated( MBadPixelsPix::kChargeSigmaNotValid );
       return kFALSE;
@@ -993,7 +994,6 @@
   if (!cal.CalcReducedSigma())
     {
-      *fLog << warn 
-            << Form("Could not calculate the reduced sigma in %s:               ",what)
-            << Form("         %4i",cal.GetPixId()) 
+      *fLog << warn << "Could not calculate the reduced sigma in " << what
+            << ":                        " << Form("%4i",cal.GetPixId())
             << endl;
       bad.SetUncalibrated( MBadPixelsPix::kChargeSigmaNotValid );
@@ -1003,7 +1003,6 @@
   if (!cal.CalcFFactor())
     {
-      *fLog << warn 
-            << Form("Could not calculate the F-Factor in %s:                    ",what)
-            << Form("         %4i",cal.GetPixId()) 
+      *fLog << warn << "Could not calculate the F-Factor in " << what
+            << ":                             " << Form("%4i",cal.GetPixId())
             << endl;
       bad.SetUncalibrated(MBadPixelsPix::kDeviatingNumPhes);
@@ -1021,7 +1020,6 @@
   if (!cal.CalcConvFFactor())
     {
-      *fLog << warn 
-            << Form("Could not calculate the Conv. FADC counts to Phes in %s:  ",what)
-            << Form("         %4i",cal.GetPixId()) 
+      *fLog << warn << "Could not calculate the Conv. FADC counts to Phes in "
+            << what << ":           " << Form("%4i",cal.GetPixId())
             << endl;
       bad.SetUncalibrated(MBadPixelsPix::kDeviatingNumPhes);