Changeset 8361 for trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

Timestamp:

03/04/07 12:01:41 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.36 2007-03-01 21:20:41 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.37 2007-03-04 12:00:30 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -214 +214 @@
         return kFALSE;
 
-    CheckExtractionWindow(fRunHeader->GetNumSamplesHiGain());
+    const Int_t nhi = fRunHeader->GetNumSamplesHiGain();
+    const Int_t nlo = fRunHeader->GetNumSamplesLoGain();
+    CheckExtractionWindow(nlo>0?nhi:0);
 
     return kTRUE;
@@ -227 +229 @@
 Int_t MPedCalcFromLoGain::Calc()
 {
+    const Int_t nhi = fRunHeader->GetNumSamplesHiGain();
+    const Int_t nlo = fRunHeader->GetNumSamplesLoGain();
+
     // Real Process
     MRawEvtPixelIter pixel(fRawEvt);
-
     while (pixel.Next())
     {
@@ -240 +244 @@
         UInt_t ab[2];
         const Float_t sum = fExtractor ?
-            CalcExtractor(pixel, pixel.GetNumHiGainSamples()) :
-            CalcSums(pixel, pixel.GetNumHiGainSamples(), ab[0], ab[1]);
+            CalcExtractor(pixel, nlo>0?nhi:0) :
+            CalcSums(pixel, nlo>0?nhi:0, ab[0], ab[1]);
 
         const UInt_t aidx   = (*fGeom)[idx].GetAidx();