Changeset 8203 for trunk/MagicSoft/Mars/mhcalib

Timestamp:

11/02/06 09:00:59 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

@@ -1257 +1257 @@
                                       MBadPixelsPix::UncalibratedType_t osctyp)
 {
-
-  if (hist.IsEmpty() || hist.IsOnlyOverflow() || hist.IsOnlyUnderflow())
-    {
-      *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() 
-            << ": Only over- or underflow in hi-gain." << endl;
+  if (hist.IsEmpty())
+  {
+      *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram empty." << endl;
       return;
-    }  
+  }
+  if (hist.IsOnlyOverflow())
+  {
+      *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only overflows." << endl;
+      return;
+  }
+  if (hist.IsOnlyUnderflow())
+  {
+      *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only underflows." << endl;
+      return;
+  }
+
   //
   // 2) Fit the Hi Gain histograms with a Gaussian
@@ -1350 +1359 @@
 {
 
-  if (hist.IsEmpty() || hist.IsOnlyOverflow() || hist.IsOnlyUnderflow())
-    {
-      *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() 
-            << ": Only over- or underflow in lo-gain." << endl;
+  if (hist.IsEmpty())
+  {
+      // *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram empty." << endl;
       return;
-    }  
+  }
+  if (hist.IsOnlyOverflow())
+  {
+      *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only overflows." << endl;
+      return;
+  }
+  if (hist.IsOnlyUnderflow())
+  {
+      *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only underflows." << endl;
+      return;
+  }
+
   //
   // 2) Fit the Hi Gain histograms with a Gaussian