Changeset 8192 for trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

Timestamp:

11/01/06 15:48:31 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.25 2006-11-01 15:48:31 tbretz Exp $
+! --------------------------------------------------------------------------
 !
 ! *
@@ -17 +19 @@
 !
 !   Author(s): Markus Gaug   02/2004 <mailto:markus@ifae.es>
+!   Author(s): Thomas Bretz <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Copyright: MAGIC Software Development, 2000-2006
 !
 !
@@ -427 +430 @@
         }
 
+      if (*max > fSaturationLimit)
+        continue;
+
       start   = pixel.GetLoGainSamples();
       end     = start + pixel.GetNumLoGainSamples();
@@ -436 +442 @@
             {
               max = p;
-              maxpos = p-start+pixel.GetNumHiGainSamples() - 1;
+              maxpos = p-start-1 + pixel.GetNumHiGainSamples();
             }
           p++;
@@ -552 +558 @@
 {
 
-
-  if (hist.IsEmpty() || hist.IsOnlyOverflow() || hist.IsOnlyUnderflow())
-    {
-      *fLog << warn << GetDescriptor() << ": Only over- or underflow in " << hist.GetName() << endl;
+  if (hist.IsEmpty())
+  {
+      *fLog << warn << hist.GetName() << ": Histogram empty." << endl;
       return;
-    }  
+  }
+  if (hist.IsOnlyOverflow())
+  {
+      *fLog << warn << hist.GetName() << ": Histogram contains only overflows." << endl;
+      return;
+  }
+  if (hist.IsOnlyUnderflow())
+  {
+      *fLog << warn << hist.GetName() << ": Histogram contains only underflows." << endl;
+      return;
+  }
 
   hist.BypassFit();