Changeset 4119 for trunk/MagicSoft

Timestamp:

05/22/04 02:54:16 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractFixedWindowPeakSearch.cc (modified) (8 diffs)
• msignal/MExtractFixedWindowPeakSearch.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/05/22: Abelardo Moralejo
+
+   * msignal/MExtractFixedWindowPeakSearch.[h,cc]
+     - changed name of variable fOffsetFromPeak to fOffsetFromWindow
+       to avoid confusion.
+     - introduced initialization to 0 of startslice and sat in FindPeak
+     - changed initialization of maxsumhi in Process from 0 to -1e6
 
  2004/05/20: Raquel de los Reyes

trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.cc

@@ -82 +82 @@
 const Byte_t MExtractFixedWindowPeakSearch::fgLoGainWindowSize     = 6;
 const Byte_t MExtractFixedWindowPeakSearch::fgPeakSearchWindowSize = 4;
-const Byte_t MExtractFixedWindowPeakSearch::fgOffsetFromPeak       = 1;
+const Byte_t MExtractFixedWindowPeakSearch::fgOffsetFromWindow     = 1;
 // --------------------------------------------------------------------------
 //
@@ -93 +93 @@
 //
 // Calls: 
-// - SetOffsetFromPeak()
+// - SetOffsetFromWindow()
 // - SetRange(fgHiGainFirst, fgHiGainLast, fgLoGainFirst, fgLoGainLast)
 //
@@ -105 +105 @@
   fTitle = title ? title : "Task to extract the signal from the FADC slices";
 
-  SetOffsetFromPeak();
+  SetOffsetFromWindow();
   SetRange(fgHiGainFirst, fgHiGainLast, fgLoGainFirst, fgLoGainLast);
 }
@@ -239 +239 @@
 // saturated slices.
 //
-void MExtractFixedWindowPeakSearch::FindPeak(Byte_t *ptr, Byte_t window, Byte_t &startslice, 
-                               Int_t &max, Int_t &sat) const
+void MExtractFixedWindowPeakSearch::FindPeak(Byte_t *ptr, Byte_t window, Byte_t &startslice, Int_t &max, Int_t &sat) const
 {
 
   const Byte_t *end = ptr + fHiGainLast - fHiGainFirst + 1;
 
+  sat = 0;
+  startslice = 0;
   Int_t sum=0;
 
@@ -339 +340 @@
   // Calculate the sum of the "window" slices starting in ptr
   //
-  sum = 0;
-  sat = 0;
   Byte_t *p = ptr;
 
@@ -359 +358 @@
 // "startslice" will mark the slice at which the highest sum begins for that pixel.
 // Then define the beginning of the integration window for ALL pixels as the slice
-// before that: startslice-fOffsetFromPeak, unless of course startslice-fOffsetFromPeak<=0,
+// before that: startslice-fOffsetFromWindow, unless of course startslice-fOffsetFromWindow<=0,
 // in which case we start at 0. We will also check that the integration window does not 
 // go beyond the FADC limits.
@@ -369 +368 @@
 
   Int_t sat;
-  Int_t maxsumhi = 0;
+  Int_t maxsumhi = -1000000;
   Byte_t startslice;
   Byte_t hiGainFirst = 0;
@@ -385 +384 @@
         {
           maxsumhi = sumhi;
-          if ((startslice-fOffsetFromPeak) > 0)
-            hiGainFirst = fHiGainFirst + startslice - fOffsetFromPeak;
+          if ((startslice-fOffsetFromWindow) > 0)
+            hiGainFirst = fHiGainFirst + startslice - fOffsetFromWindow;
           else
             hiGainFirst = fHiGainFirst;

trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.h

@@ -17 +17 @@
   static const Byte_t fgLoGainWindowSize;     // Default for fWindowSizeLoGain (now set to: 6)
   static const Byte_t fgPeakSearchWindowSize; // Default for fPeakSearchWindowSize (now set to: 4)
-  static const Byte_t fgOffsetFromPeak;       // Default for fOffsetFromPeak   (now set to: 2)
+  static const Byte_t fgOffsetFromWindow;     // Default for fOffsetFromWindow   (now set to: 2)
   
   Byte_t  fWindowSizeHiGain;     // Number of Hi Gain slices in window
   Byte_t  fWindowSizeLoGain;     // Number of Lo Gain slices in window
   Byte_t  fPeakSearchWindowSize; // Size of FADC window in the search for the highest peak of all pixels.
-  Byte_t  fOffsetFromPeak;       // Number of slices to start extraction from global peak
+  Byte_t  fOffsetFromWindow;     // Number of slices to start extraction before search window
 
   void   FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Int_t &sum, Byte_t &sat) const;
@@ -39 +39 @@
     void SetWindows(Byte_t windowh=fgHiGainWindowSize, Byte_t windowl=fgLoGainWindowSize, 
                     Byte_t peaksearchwindow=fgPeakSearchWindowSize);
-    void SetOffsetFromPeak(Byte_t offset=fgOffsetFromPeak)    {  fOffsetFromPeak = offset; }
+    void SetOffsetFromWindow(Byte_t offset=fgOffsetFromWindow)  {  fOffsetFromWindow = offset; }
     
     ClassDef(MExtractFixedWindowPeakSearch, 0) // Signal Extractor for fixed size trigger-corrected extraction window