Changeset 4252 for trunk/MagicSoft

Timestamp:

06/01/04 13:21:36 (20 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/06/01: Abelardo Moralejo
+
+   * msignal/MExtractFixedWindowPeakSearch.[h,cc]
+     - Added variable fLowGainPeakShift and setter. It allows to shift
+       the integration window for low gain with respect to the one of
+       the high gain. By default its value is 0 (corresponding to a 
+       total delay of 15 slices) so that default behaviour of the
+       extractor is the same as before.
 
  2004/06/01: Markus Gaug

trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.cc

@@ -55 +55 @@
 //   fLoGainWindowSize     = fgLoGainWindowSize     = 6
 //   fPeakSearchWindowSize = fgPeakSearchWindowSize = 4
+//   fLowGainPeakShift     = fgLowGainPeakShift     = 0
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -83 +84 @@
 const Byte_t MExtractFixedWindowPeakSearch::fgPeakSearchWindowSize = 4;
 const Byte_t MExtractFixedWindowPeakSearch::fgOffsetFromWindow     = 1;
+const Byte_t MExtractFixedWindowPeakSearch::fgLowGainPeakShift     = 0;
 // --------------------------------------------------------------------------
 //
@@ -91 +93 @@
 // - fWindowSizeLoGain to fgWindowSizeLoGain
 // - fPeakSearchWindowSize to fgPeakSearchWindowSize
+// - fLowGainPeakShift to fgLowGainPeakShift
 //
 // Calls: 
@@ -99 +102 @@
     : fWindowSizeHiGain(fgHiGainWindowSize), 
       fWindowSizeLoGain(fgLoGainWindowSize),
-      fPeakSearchWindowSize(fgPeakSearchWindowSize)
+      fPeakSearchWindowSize(fgPeakSearchWindowSize),
+      fLowGainPeakShift(fgLowGainPeakShift)
 {
 
@@ -392 +396 @@
 
 
-  loGainFirst = ( hiGainFirst > fLoGainFirst ) ? hiGainFirst : fLoGainFirst;
+  loGainFirst = ( hiGainFirst+fLowGainPeakShift > fLoGainFirst ) ? 
+      hiGainFirst+fLowGainPeakShift : fLoGainFirst;
 
   // Make sure we will not integrate beyond the hi gain limit:

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 fgOffsetFromWindow;     // Default for fOffsetFromWindow   (now set to: 2)
-  
+  static const Byte_t fgOffsetFromWindow;     // Default for fOffsetFromWindow (now set to: 1)
+  static const Byte_t fgLowGainPeakShift;     // Default for fLowGainPeakShift (now set to: 0)
+
   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  fOffsetFromWindow;     // Number of slices to start extraction before search window
+  Byte_t  fLowGainPeakShift;     // Shift of the low gain pulse with respect to the high gain pulse, in slices: it is 0 if the low gain is delayed with respect to HG by 15 slices.
 
   void   FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Int_t &sum, Byte_t &sat) const;
@@ -40 +42 @@
                     Byte_t peaksearchwindow=fgPeakSearchWindowSize);
     void SetOffsetFromWindow(Byte_t offset=fgOffsetFromWindow)  {  fOffsetFromWindow = offset; }
+
+    void SetLowGainPeakShift(Byte_t shift=fgLowGainPeakShift) { fLowGainPeakShift = shift; }
     
     ClassDef(MExtractFixedWindowPeakSearch, 0) // Signal Extractor for fixed size trigger-corrected extraction window