Changeset 7832 for trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

Timestamp:

08/02/06 08:03:32 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -88 +88 @@
 const Int_t  MExtractTimeAndChargeDigitalFilter::fgSignalStartBinHiGain    =  4;
 const Int_t  MExtractTimeAndChargeDigitalFilter::fgSignalStartBinLoGain    =  4;
-const Float_t MExtractTimeAndChargeDigitalFilter::fgOffsetLoGain           =  1.7; // 5 ns
+const Float_t MExtractTimeAndChargeDigitalFilter::fgOffsetLoGain           =  1.05;
 const Float_t MExtractTimeAndChargeDigitalFilter::fgLoGainStartShift       = -1.8;
 
@@ -113 +113 @@
     SetSignalStartBin();
 
-    SetOffsetLoGain(fgOffsetLoGain);
-    SetLoGainStartShift(fgLoGainStartShift);
+    SetOffsetLoGain(fgOffsetLoGain);          // Order between both
+    SetLoGainStartShift(fgLoGainStartShift);  // is important
 }
 
@@ -480 +480 @@
 
   // here, the first high-gain slice is already included in the fTimeShiftHiGain
-  time = fTimeShiftHiGain + max_p - Float_t(t_iter)/fBinningResolutionHiGain;
+//  time = fTimeShiftHiGain + max_p - Float_t(t_iter)/fBinningResolutionHiGain;
+  time = max_p + fTimeShiftHiGain + (Float_t)fHiGainFirst /* this shifts the time to the start of the rising edge */
+      - ((Float_t)t_iter)/fBinningResolutionHiGain;
 
   const Float_t timefineadjust = time_sum/sum;