Changeset 8349 for trunk/MagicSoft/Mars/mhcalib

Timestamp:

03/01/07 23:37:37 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.30 2007-03-01 23:04:55 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.31 2007-03-01 23:37:08 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -21 +21 @@
 !   Author(s): Thomas Bretz <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2006
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -134 +134 @@
 using namespace std;
 
-const Byte_t  MHCalibrationPulseTimeCam::fgSaturationLimit   = 254;
+const Byte_t  MHCalibrationPulseTimeCam::fgSaturationLimit   = 245;
 const Byte_t  MHCalibrationPulseTimeCam::fgLowerSignalLimit  =  85;
 const Int_t   MHCalibrationPulseTimeCam::fgNumPixelsRequired = 2;
@@ -385 +385 @@
                 continue;
 
-        Float_t *beg = evt->GetSamples(idx);
-        Float_t *end = beg + evt->GetNumSamples();;
-        Float_t *max = beg;
-
-        for (Float_t *ptr=beg+1; ptr<end; ptr++)
-            if (*ptr>*max)
-                max = ptr;
-
-        if (*max<fLowerSignalLimit || *max>fSaturationLimit)
+        // Check for saturation
+        if (evt->GetSaturation(idx, fSaturationLimit)>0)
             continue;
 
-        const Int_t maxpos = max-beg-1;
+        // Get position of maximum
+        const Int_t   pos = evt->GetMax(idx);
+        const Float_t max = evt->GetSamples(idx)[pos];
+
+        // check if maximum is high enough
+        if (max<fLowerSignalLimit)
+            continue;
+
+        const Int_t maxpos = pos-1;
 
         (*this)[idx].FillHist(maxpos);