Changeset 5927 for trunk

Timestamp:

01/21/05 13:13:56 (20 years ago)

Author:

mazin

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractTimeAndCharge.cc (modified) (2 diffs)
• msignal/MExtractTimeAndChargeDigitalFilter.cc (modified) (3 diffs)
• msignal/MExtractTimeAndChargeSlidingWindow.cc (modified) (3 diffs)
• msignal/MExtractTimeAndChargeSpline.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/01/21 Markus Gaug
+
+   * msignal/MExtractTimeAndChargeDigitalFilter.cc
+     - use the max. bin content for low-gain extraction
 
  2005/01/21 Florian Goebel

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -186 +186 @@
       Byte_t sathi=0;
 
-      fMaxBinContent = 0;
+      // Initialize fMaxBinContent for the case, it gets not set by the derived class
+      fMaxBinContent = fMaxBinContentLimit + 1; 
 
       const Int_t pixidx = pixel.GetPixelId();
@@ -211 +212 @@
       // Adapt the low-gain extraction range from the obtained high-gain time
       //
-      if (pixel.HasLoGain() && (fMaxBinContent < fMaxBinContentLimit) )
+      if (pixel.HasLoGain() && (fMaxBinContent > fMaxBinContentLimit) )
       {
           deltasumlo  = 0; // make logain of MExtractedSignalPix valid

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -260 +260 @@
   const Float_t pedmean[2] = { pedes + ABoffs, pedes - ABoffs };
 
+  fMaxBinContent = 0;
   //
   // Check for saturation in all other slices
@@ -274 +275 @@
           maxpos =  p-ptr;
         }
+
+      if (*p > fMaxBinContent)
+        fMaxBinContent = *p;
 
       if (*p++ >= fSaturationLimit)
@@ -296 +300 @@
             }
           
+          if (*logain > fMaxBinContent)
+            fMaxBinContent = *logain;
+
           if (*logain++ >= fSaturationLimit)
             if (!sat)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSlidingWindow.cc

@@ -217 +217 @@
 
   Float_t PedMean[2] = { pedes + ABoffs, pedes - ABoffs };
+
+  fMaxBinContent = 0;
   //
   // Check for saturation in all other slices
@@ -229 +231 @@
       fHiGainSignal[count] = signal;
       
+      if (*p > fMaxBinContent)
+        fMaxBinContent = *p;
+
       if (*p++ >= fSaturationLimit)
         if (!sat)
@@ -285 +290 @@
           sum                 += signal - fHiGainSignal[count];
           fHiGainSignal[count + fWindowSizeHiGain] = signal;
+
+          if (*l > fMaxBinContent)
+            fMaxBinContent = *logain;
+
           if (*l++ >= fSaturationLimit)
             if (!sat)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc

@@ -311 +311 @@
   const Float_t pedmean[2] = { pedes + ABoffs, pedes - ABoffs };
 
-  fAbMax        = 0.;
-  fAbMaxPos     = 0.;
-  fHalfMax      = 0.;
-  Int_t  maxpos = 0;
-  Int_t  max    = 0;
+  fAbMax         = 0.;
+  fAbMaxPos      = 0.;
+  fHalfMax       = 0.;
+  fMaxBinContent = 0;
+  Int_t  maxpos  = 0;
 
   //
@@ -327 +327 @@
       *sample++ = (Float_t)*p - pedmean[(ids++ + abflag) & 0x1];
 
-      if (*p > max)
+      if (*p > fMaxBinContent)
         {
           maxpos = ids-fHiGainFirst-1;
-          max    = *p;
+          fMaxBinContent = *p;
         }
 
@@ -349 +349 @@
           *sample++ = (Float_t)*logain - pedmean[(ids++ + abflag) & 0x1];
 
-          if (*logain > max)
+          if (*logain > fMaxBinContent)
             { 
               maxpos = ids-fHiGainFirst-1;
-              max    = *logain;
+              fMaxBinContent = *logain;
             }