Changeset 7288 for trunk/MagicSoft/Mars/mhcalib

Timestamp:

08/17/05 17:36:32 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

• MHCalibrationCam.cc (modified) (2 diffs)
• MHCalibrationChargeCam.cc (modified) (1 diff)
• MHCalibrationPulseTimeCam.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

@@ -1261 +1261 @@
     {
       *fLog << warn << GetDescriptor()
-            << ": Only overflow or underflow in hi-gain pixel: " << pix.GetPixId() << endl;
+            << ": Only over- or underflow in hi-gain pixel: " << pix.GetPixId() << endl;
       return;
     }  
@@ -1353 +1353 @@
     {
       *fLog << warn << GetDescriptor()
-            << ": Only overflow or underflow in lo-gain pixel: " << pix.GetPixId() << endl;
+            << ": Only over- or underflow in lo-gain pixel: " << pix.GetPixId() << endl;
       return;
     }  

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -1119 +1119 @@
                                               Byte_t first, Byte_t last)
 {
-  
-  const Float_t mean = hist.GetAbsTimeMean();
-  const Float_t rms  = hist.GetAbsTimeRms();
-
-  pix.SetAbsTimeMean ( mean );
-  pix.SetAbsTimeRms  ( rms  );
-  
-  const Float_t lowerlimit = (Float_t)first + fTimeLowerLimit;
-  const Float_t upperlimit = (Float_t)last  - fTimeUpperLimit;  
-
-  if ( mean < lowerlimit)
-    {
-      *fLog << warn
-            << Form("Mean ArrivalTime: %3.1f < %2.1f slices from lower edge: %2i in pixel %s",
-                    mean,fTimeLowerLimit,(Int_t)first,hist.GetName()) << endl;
-      bad.SetUncalibrated( MBadPixelsPix::kMeanTimeInFirstBin );
-    }
-  
-  if ( mean  > upperlimit )
-    {
-      *fLog << warn
-            << Form("Mean ArrivalTime: %3.1f > %2.1f slices from upper edge: %2i in pixel %s",
-                    mean,fTimeUpperLimit,(Int_t)last,hist.GetName()) << endl;
-      bad.SetUncalibrated( MBadPixelsPix::kMeanTimeInLast2Bins );
+    const Float_t mean = hist.GetAbsTimeMean();
+    const Float_t rms  = hist.GetAbsTimeRms();
+
+    pix.SetAbsTimeMean(mean);
+    pix.SetAbsTimeRms(rms);
+
+    const Float_t lowerlimit = (Float_t)first + fTimeLowerLimit;
+    const Float_t upperlimit = (Float_t)last  - fTimeUpperLimit;
+
+    if (mean<lowerlimit)
+    {
+        *fLog << warn << "Mean Arr.Time: "
+            << Form("%4.1f < %4.1f, %3.1f", mean, TMath::Floor(first)+fTimeLowerLimit, fTimeLowerLimit)
+            << " slices below " << Form("%2i", (Int_t)first) << " in "
+            << hist.GetName() << endl;
+        bad.SetUncalibrated( MBadPixelsPix::kMeanTimeInFirstBin );
+    }
+
+    if (mean>upperlimit)
+    {
+        *fLog << warn << "Mean Arr.Time: "
+            << Form("%4.1f > %4.1f, %3.1f", mean, TMath::Floor(last)-fTimeUpperLimit, fTimeUpperLimit)
+            << " slices above " << Form("%2i", (Int_t)last) << " in "
+            << hist.GetName() << endl;
+        bad.SetUncalibrated( MBadPixelsPix::kMeanTimeInLast2Bins );
     }
 }

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -555 +555 @@
   if (hist.IsEmpty() || hist.IsOnlyOverflow() || hist.IsOnlyUnderflow())
     {
-      *fLog << warn << GetDescriptor()
-            << ": Only overflow or underflow in hi-gain pixel: " << hist.GetName() << endl;
+      *fLog << warn << GetDescriptor() << ": Only over- or underflow in " << hist.GetName() << endl;
       return;
     }