Changeset 8297 for trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

Timestamp:

02/03/07 20:07:52 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.61 2007-02-03 15:10:14 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.62 2007-02-03 20:05:35 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -32 +32 @@
 //   Base class for the signal extractors which extract the arrival time 
 //   and the signal at the same time. Uses the functions 
-//   FindTimeAndChargeHiGain() and FindTimeAndChargeLoGain() to extract the signal and 
-//   substract the pedestal value.
+//   FindTimeAndChargeHiGain() and FindTimeAndChargeLoGain() to extract
+//   the signal.
 //
 //   The following figure gives and example of possible inheritance trees. 
@@ -53 +53 @@
 //   - fSqrtHiGainSamples
 //   - fSqrtLoGainSamples
+//
+//
+// Class Version 3:
+// ----------------
+//   - Byte_t fMaxBinContent;
+//
 //
 // Input Containers:
@@ -243 +249 @@
         // For extractors like the digital filter and the spline
         // we allow extracpolation by one slice.
+        // FIXME: Defined Out-Of-Range better so that the extractors
+        //        know what to return!
         if (deltatimehi>-0.5 && (timehi<-1 || timehi>=rangehi))
         {
             // Flag this as unreliable!
             timehi = gRandom->Uniform(rangehi+1)-1;
-            // deltatimehi=-1;
+            // deltatimehi=-1; // Set PIXEL to UNRELIABLE?
         }
 
@@ -323 +331 @@
             numsatlo = fSignal->GetSaturation(pixidx, fSaturationLimit, satlo0, satlo1);
 
+            //if (satlo0>first && satlo1<last && numsatlo>2)
+            //{
+            //    fSignal->InterpolateSaturation(pixidx, fSaturationLimit, satlo0, satlo1);
+            //    numsatlo = 0;
+            //}
+
             const Int_t rangelo = last-first+1;
             FindTimeAndChargeLoGain2(sig+first, rangelo,
@@ -345 +359 @@
                 // Flag this as unreliable!
                 timelo = gRandom->Uniform(rangelo+1)-1;
-                //deltatimelo=-1;
+                //deltatimelo=-1; // Set PIXEL to UNRELIABLE?
             }
 
@@ -356 +370 @@
                 deltasumlo=deltatimelo=-1;
 
+            // The extracted lo-gain signal cannot be zero or
+            // negative at all, so it must be wrong
+            if (sumlo<=0)
+                deltasumlo=-1;
+
             //if (TMath::Abs(timelo-fOffsetLoGain - timehi)>1.0)
             //    deltatimelo = -1;
         }
-
 
         // Now store the result in the corresponding containers