Changeset 8484 for trunk/MagicSoft/Mars/mcalib

Timestamp:

05/10/07 13:16:56 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrateData.cc (modified) (2 diffs)
• MCalibrationChargeCalc.cc (modified) (3 diffs)
• MCalibrationRelTimeCalc.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.68 2007-04-27 10:04:46 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.69 2007-05-10 12:14:54 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -666 +666 @@
             calibConv    = -1.;
             calibFFactor = -1.;
-            *fLog << warn << GetDescriptor() << ": WARNING - ";
-            *fLog << "Conversion factor " << calibConv << " of Pixel " << pixidx << " out of range ]";
+            *fLog << warn << GetDescriptor() << ": ";
+            *fLog << "Conv.factor " << calibConv << " of Pixel " << pixidx << " out of range ]";
             *fLog << fCalibConvMinLimit << "," << fCalibConvMaxLimit << "[... set to 0. " << endl;
           }

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.178 2007-05-09 12:15:52 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.179 2007-05-10 12:14:54 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -745 +745 @@
             if (res<0) //FIXME!!! How does this happen?
             {
-                *fLog << warn << "Pixel  " << setw(4) << i << ": Abs-time resolution could not be calculated." << endl;
+                *fLog << warn << "Pixel  " << setw(4) << i << ": Abs-time rms could not be calculated." << endl;
                 (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kDeviatingTimeResolution);
                 continue;
@@ -753 +753 @@
             if (res<=lolim || res>=hilim)
             {
-                *fLog << warn << "Pixel  " << setw(4) << i << ": Deviating abs-time resolution: "
+                *fLog << warn << "Pixel  " << setw(4) << i << ": Deviation from abs-time rms: "
                     << Form("%5.2f", res) << " out of range "
                     << Form("[%4.2f,%4.2f]", lolim, hilim) << endl;

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -228 +228 @@
 
   PrintUncalibrated(MBadPixelsPix::kDeviatingTimeResolution,    
-                    Form("%s%2.1f%s","Time resol. less than ", fRelTimeResolutionLimit, " med-dev from median:"));
+                    Form("%s%2.1f%s","Rel.time rms more than ", fRelTimeResolutionLimit, " dev from median:"));
   PrintUncalibrated(MBadPixelsPix::kRelTimeOscillating,   
                     "Pixels with changing Rel. Times over time:");
@@ -308 +308 @@
             if (res<0) //FIXME!!! How does this happen?
             {
-                *fLog << warn << "Pixel  " << setw(4) << i << ": Rel-time resolution could not be calculated." << endl;
+                *fLog << warn << "Pixel  " << setw(4) << i << ": Rel-time rms could not be calculated." << endl;
                 (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kDeviatingTimeResolution);
                 continue;
@@ -316 +316 @@
             if (res<=lolim || res>=hilim)
             {
-                *fLog << warn << "Pixel  " << setw(4) << i << ": Deviating rel-time resolution: "
+                *fLog << warn << "Pixel  " << setw(4) << i << ": Deviation from rel-time rms: "
                     << Form("%5.2f", res) << " out of range "
                     << Form("[%4.2f,%4.2f]", lolim, hilim) << endl;