Changeset 8584 for trunk/MagicSoft/Mars/msignal

Timestamp:

06/19/07 12:01:35 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc (modified) (10 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.65 2007-05-16 13:56:17 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.66 2007-06-19 11:01:34 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -189 +189 @@
 // order polynomial interpolation.
 //
-Double_t MExtractTimeAndCharge::GetSaturationTime(Int_t sat0, const Float_t *sig, Int_t maxpos) const
+Double_t MExtractTimeAndCharge::GetSaturationTime(Int_t sat0, const Float_t *sig, Int_t maxconthalf) const
 {
     const Int_t p = sat0>1 ? sat0-2 : sat0-1;
@@ -195 +195 @@
         return 0;
 
-    const Float_t &maxcont = sig[maxpos];
     if (sat0==1)
-        return sig[0]>maxcont/2 ? 0 : 0.5;
+        return sig[0]>maxconthalf ? 0 : 0.5;
 
     if (sig[p]>sig[p+1] || sig[p+1]>sig[p+2])
-        return sig[p+1]>maxcont/2 ? sat0-1 : sat0-0.5;
+        return sig[p+1]>maxconthalf ? sat0-1 : sat0-0.5;
 
     // Find the place at which the signal is maxcont/2
@@ -206 +205 @@
     const TVector3 vy(p, p+1, p+2);
 
-    return MMath::InterpolParabLin(vx, vy, maxcont/2);
+    return MMath::InterpolParabLin(vx, vy, maxconthalf);
 }
 
@@ -223 +222 @@
     const Int_t numl = fRunHeader->GetNumSamplesLoGain();
 
+    const UInt_t satlim = fSaturationLimit*fRunHeader->GetMax();
+
     MRawEvtPixelIter pixel(fRawEvt);
     while (pixel.Next())
@@ -230 +231 @@
         const Float_t *sig = fSignal->GetSamples(pixidx);
 
-        const UInt_t maxcont  = fSignal->GetRawMaxVal(pixidx, fHiGainFirst, fHiGainLast);
-        const  Int_t maxposhi = fSignal->GetMaxPos(pixidx, fHiGainFirst, fHiGainLast);
-
         // Would it be better to take lastsat-firstsat?
         Int_t sathi0   = fHiGainFirst;  // First slice to extract and first saturating slice
         Int_t sathi1   = fHiGainLast;   // Last  slice to extract and last saturating slice
-        Int_t numsathi = fSignal->GetSaturation(pixidx, fSaturationLimit, sathi0, sathi1);
+        Int_t numsathi = fSignal->GetSaturation(pixidx, satlim, sathi0, sathi1);
 
         Float_t sumhi =0., deltasumhi =-1; // Set hi-gain of MExtractedSignalPix valid
@@ -246 +244 @@
 
         if (numsathi<2)
+        {
+            const Int_t maxposhi = fSignal->GetMaxPos(pixidx, fHiGainFirst, fHiGainLast);
             FindTimeAndChargeHiGain2(sig+fHiGainFirst, rangehi,
                                      sumhi, deltasumhi, timehi, deltatimehi,
                                      numsathi, maxposhi);
+        }
 
         // If we have saturating slices try to get a better estimate
         // of the arrival time than timehi or sathi0. This is
         // usefull to know where to start lo-gain extraction.
+        const UInt_t maxcont = fSignal->GetRawMaxVal(pixidx, fHiGainFirst, fHiGainLast);
         if (numsathi>1)
         {
-            timehi = GetSaturationTime(sathi0, sig, fHiGainFirst+maxposhi)-fHiGainFirst;
+            timehi = GetSaturationTime(sathi0, sig, maxcont/2)-fHiGainFirst;
             deltatimehi = 0;
         }
@@ -338 +340 @@
              */
             // Would it be better to take lastsat-firstsat?
-            const Int_t maxposlo = fSignal->GetMaxPos(pixidx, first, last);
-
             Int_t satlo0 = first;   // First slice to extract and first saturating slice
             Int_t satlo1 = last;    // Last  slice to extract and last saturating slice
-            numsatlo = fSignal->GetSaturation(pixidx, fSaturationLimit, satlo0, satlo1);
+            numsatlo = fSignal->GetSaturation(pixidx, satlim, satlo0, satlo1);
 
             //if (satlo0>first && satlo1<last && numsatlo>2)
@@ -350 +350 @@
             //}
 
-            const Int_t rangelo = last-first+1;
+            const Int_t rangelo  = last-first+1;
+            const Int_t maxposlo = fSignal->GetMaxPos(pixidx, first, last);
             FindTimeAndChargeLoGain2(sig+first, rangelo,
                                      sumlo, deltasumlo, timelo, deltatimelo,
@@ -360 +361 @@
             if (numsatlo>1)
             {
-                timelo = GetSaturationTime(satlo0, sig, first+maxposlo)-numh-first;
+                const UInt_t maxrawlo = fSignal->GetRawMaxPos(pixidx, fHiGainFirst, fHiGainLast);
+                timelo = GetSaturationTime(satlo0, sig, first+maxrawlo)-numh-first;
                 deltatimelo = 0;
             }