Changeset 8147 for trunk/MagicSoft/Mars/mhcalib

Timestamp:

10/23/06 13:27:21 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

• MHCalibrationChargeCam.cc (modified) (4 diffs)
• MHCalibrationPulseTimeCam.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -719 +719 @@
       
       const Float_t sumhi = pix.GetExtractedSignalHiGain();
-      const Bool_t  sathi = pix.IsHiGainSaturated();
+      const Int_t   sathi = pix.IsHiGainSaturated() ? 1 : 0;
 
       if (IsOscillations())
@@ -742 +742 @@
         {
           MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)(*this)(i);
-          const Float_t sumlo  = pix.GetExtractedSignalLoGain();
-          const Int_t   satlo = (Int_t)pix.GetNumLoGainSaturated();
+          const Float_t sumlo = pix.GetExtractedSignalLoGain();
+          const Int_t   satlo = pix.IsLoGainSaturated() ? 1 : 0;
           
           if (IsOscillations())
@@ -1130 +1130 @@
     if (mean<lowerlimit)
     {
-        *fLog << warn << "Mean Arr.Time: "
+        *fLog << warn << hist.GetName() << ": 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;
+            << " slices below " << Form("%2i", (Int_t)first) << endl;
         bad.SetUncalibrated( MBadPixelsPix::kMeanTimeInFirstBin );
     }
@@ -1139 +1138 @@
     if (mean>upperlimit)
     {
-        *fLog << warn << "Mean Arr.Time: "
+        *fLog << warn << hist.GetName() << ": 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;
+            << " slices above " << Form("%2i", (Int_t)last) << endl;
         bad.SetUncalibrated( MBadPixelsPix::kMeanTimeInLast2Bins );
     }

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -414 +414 @@
       Byte_t *end   = start + pixel.GetNumHiGainSamples();
       Byte_t *p     = start;
-      Byte_t max    = 0;
+      Byte_t *max   = start;
       Int_t  maxpos = 0;
 
       while (p < end)
         {
-          if ((*p > max) && (*p < fSaturationLimit))
+          if (*p > *max)
             {
-              max = *p;
+              max = p;
               maxpos = p-start-1;
             }
@@ -433 +433 @@
       while (p < end)
         {
-          if ((*p > max) && (*p < fSaturationLimit))
+          if (*p > *max)
             {
-              max = *p;
+              max = p;
               maxpos = p-start+pixel.GetNumHiGainSamples() - 1;
             }
@@ -441 +441 @@
         }
 
-      if (max < fLowerSignalLimit)
+      if (*max < fLowerSignalLimit || *max > fSaturationLimit)
         continue;