Changeset 5701 for trunk/MagicSoft/Mars/msignal

Timestamp:

01/05/05 14:29:59 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MArrivalTimePix.cc (modified) (3 diffs)
• MExtractTimeAndCharge.cc (modified) (3 diffs)
• MExtractTimeAndChargeDigitalFilter.cc (modified) (1 diff)
• MExtractedSignalPix.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/msignal/MArrivalTimePix.cc

@@ -53 +53 @@
 //
 MArrivalTimePix::MArrivalTimePix(const char* name, const char* title)
-  : fArrivalTimeHiGain(gkSignalInitializer),
-    fArrivalTimeHiGainError(gkSignalInitializer),
-    fArrivalTimeLoGain(gkSignalInitializer),
-    fArrivalTimeLoGainError(gkSignalInitializer),
-    fNumHiGainSaturated(0),
-    fNumLoGainSaturated(0)
 {
   fName  = name  ? name  : "MArrivalTimePix";
   fTitle = title ? title : "Container of the Extracted Signals";
+
+  Clear();
 }
 
@@ -71 +67 @@
 {
   fArrivalTimeHiGain      = gkSignalInitializer;
-  fArrivalTimeHiGainError = gkSignalInitializer;
+  fArrivalTimeHiGainError = -1;
   fArrivalTimeLoGain      = gkSignalInitializer;
-  fArrivalTimeLoGainError = gkSignalInitializer;
+  fArrivalTimeLoGainError = -1;
   
   fNumHiGainSaturated = 0;
@@ -96 +92 @@
 Bool_t MArrivalTimePix::IsValid() const
 {
-    return fArrivalTimeHiGain >= 0. || fArrivalTimeHiGainError >= 0.;
+    return (!IsLoGainUsed() && fArrivalTimeHiGainError >= 0) || (IsLoGainUsed() && fArrivalTimeLoGainError >= 0);
 }
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -171 +171 @@
       // Find signal in hi- and lo-gain
       //
-      Float_t sumhi =0., deltasumhi =0.;
-      Float_t timehi=0., deltatimehi=0.;
+      Float_t sumhi =0., deltasumhi =0; // Set hi-gain of MExtractedSignalPix valid
+      Float_t timehi=0., deltatimehi=0; // Set hi-gain of MArrivalTimePix valid
       Byte_t sathi=0;
 
-      const Int_t pixid = pixel.GetPixelId();
-      const MPedestalPix  &ped = (*fPedestals)[pixid];
+      const Int_t pixidx = pixel.GetPixelId();
+      const MPedestalPix  &ped = (*fPedestals)[pixidx];
       const Bool_t higainabflag = pixel.HasABFlag();
 
@@ -183 +183 @@
                               timehi, deltatimehi, 
                               sathi, ped, higainabflag);
+
+      // Make sure that in cases the time couldn't be correctly determined
+      // more meaningfull default values are assigned
+      if (timehi<0)
+          timehi = -1;
+      if (timehi>pixel.GetNumHiGainSamples())
+          timehi = pixel.GetNumHiGainSamples();
       
-      Float_t sumlo =0., deltasumlo =0.;
-      Float_t timelo=0., deltatimelo=0.;
+      Float_t sumlo =0., deltasumlo =-1.; // invalidate logain of MExtractedSignalPix
+      Float_t timelo=0., deltatimelo=-1;  // invalidate logain of MArrivalTimePix
       Byte_t satlo=0;
       
@@ -192 +199 @@
       //
       if (pixel.HasLoGain())
-        {
+      {
+          deltasumlo  = 0; // make logain of MExtractedSignalPix valid
+          deltatimelo = 0; // make logain of MArrivalTimePix valid
+
           fLoGainFirstSave = fLoGainFirst;
           const Byte_t logainstart = (Byte_t)(timehi+fLoGainStartShift);
           if (!sathi)
-            fLoGainFirst = logainstart > fLoGainFirstSave ? logainstart : fLoGainFirstSave;
-        
-          if ( fLoGainFirst < fLoGainLast )
-            {
+              fLoGainFirst = logainstart > fLoGainFirstSave ? logainstart : fLoGainFirstSave;
+
+          if (fLoGainFirst < fLoGainLast)
+          {
               const Bool_t logainabflag = (higainabflag + pixel.GetNumHiGainSamples()) & 0x1;
-              FindTimeAndChargeLoGain(pixel.GetLoGainSamples()+fLoGainFirst, 
-                                      sumlo, deltasumlo, 
-                                      timelo, deltatimelo, 
+              FindTimeAndChargeLoGain(pixel.GetLoGainSamples()+fLoGainFirst,
+                                      sumlo, deltasumlo,
+                                      timelo, deltatimelo,
                                       satlo, ped, logainabflag);
-            }
-          fLoGainFirst     = fLoGainFirstSave;
-        }
-      
-      MExtractedSignalPix &pix = (*fSignals)[pixid];
-      MArrivalTimePix     &tix = (*fArrTime)[pixid];      
+          }
+          fLoGainFirst = fLoGainFirstSave;
+
+          // Make sure that in cases the time couldn't be correctly determined
+          // more meaningfull default values are assigned
+          if (timelo<0)
+              timelo = -1;
+          if (timelo>pixel.GetNumLoGainSamples())
+              timelo = pixel.GetNumLoGainSamples();
+      }
+
+      MExtractedSignalPix &pix = (*fSignals)[pixidx];
+      MArrivalTimePix     &tix = (*fArrTime)[pixidx];
 
       pix.SetExtractedSignal(sumhi, deltasumhi,sumlo, deltasumlo);
       pix.SetGainSaturation(sathi, sathi, satlo);
-      
+
       tix.SetArrivalTime(timehi, deltatimehi, timelo-fOffsetLoGain, deltatimelo);
       tix.SetGainSaturation(sathi, sathi, satlo);

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -517 +517 @@
   {
     const Int_t   idx = fBinningResolutionLoGain*sample + fBinningResolutionHalfLoGain + t_iter;
-    const Int_t   ids = max_p + sample;;
+    const Int_t   ids = max_p + sample;
     const Float_t pex = ids < 0 ? 0. : ( ids >= range ? 0. : fLoGainSignal[ids]);
     sum              += fAmpWeightsLoGain [idx]*pex; 

trunk/MagicSoft/Mars/msignal/MExtractedSignalPix.cc

@@ -53 +53 @@
 //
 MExtractedSignalPix::MExtractedSignalPix(const char* name, const char* title)
-  : fExtractedSignalHiGain(gkSignalInitializer),
-    fExtractedSignalHiGainError(gkSignalInitializer),
-    fExtractedSignalLoGain(gkSignalInitializer),
-    fExtractedSignalLoGainError(gkSignalInitializer),
-    fLoGainUsed(kFALSE),
-    fNumHiGainSaturated(0),
-    fNumLoGainSaturated(0)
 {
   fName  = name  ? name  : "MExtractedSignalPix";
   fTitle = title ? title : "Container of the Extracted Signals";
+
+  Clear();
 }
 
@@ -72 +67 @@
 {
   fExtractedSignalHiGain      = gkSignalInitializer;
-  fExtractedSignalHiGainError = gkSignalInitializer;
+  fExtractedSignalHiGainError = -1;
   fExtractedSignalLoGain      = gkSignalInitializer;
-  fExtractedSignalLoGainError = gkSignalInitializer;
+  fExtractedSignalLoGainError = -1;
   
   fLoGainUsed = kFALSE;
@@ -99 +94 @@
 Bool_t MExtractedSignalPix::IsValid() const
 {
-    return fExtractedSignalHiGain >= 0. || fExtractedSignalHiGainError >= 0.;
+    return (!IsLoGainUsed() && fExtractedSignalHiGainError >= 0) || (IsLoGainUsed() && fExtractedSignalLoGainError >= 0);
 }