Changeset 5156 for trunk/MagicSoft/Mars/mcalib

Timestamp:

10/01/04 16:41:51 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargeCalc.cc (modified) (7 diffs)
• MCalibrationRelTimeCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ +1 @@
+
 /* ======================================================================== *\
 !
@@ -955 +956 @@
   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 +964 @@
    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 +972 @@
   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 +981 @@
   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 +991 @@
   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 +1001 @@
   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;

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -418 +418 @@
       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();