Changeset 5793 for trunk/MagicSoft/Mars/msignal

Timestamp:

01/10/05 22:32:14 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractTimeAndChargeDigitalFilter.cc (modified) (5 diffs)
• MExtractTimeAndChargeDigitalFilter.h (modified) (1 diff)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -79 +79 @@
 const Int_t  MExtractTimeAndChargeDigitalFilter::fgSignalStartBinLoGain    =  4;
 const TString MExtractTimeAndChargeDigitalFilter::fgNameWeightsFile        = "msignal/cosmics_weights.dat";
+const Float_t MExtractTimeAndChargeDigitalFilter::fgOffsetLoGain           = 1.8;   // 5 ns
 // --------------------------------------------------------------------------
 //
@@ -102 +103 @@
 
     SetNameWeightsFile();
+    SetOffsetLoGain(fgOffsetLoGain);
 }
 
@@ -199 +201 @@
 
   fTimeShiftHiGain = (Float_t)fHiGainFirst + 0.5 + 1./fBinningResolutionHiGain;
-  fTimeShiftLoGain = (Float_t)fLoGainFirst + 0.5 + 1./fBinningResolutionLoGain;
+  fTimeShiftLoGain = 0.5 + 1./fBinningResolutionLoGain;
   // 
   // We need here the effective number of samples which is about 2.5 in the case of a window
@@ -209 +211 @@
   fSqrtLoGainSamples = TMath::Sqrt(fNumLoGainSamples);
   
+  Print("weights");
+
   return kTRUE;
 }
@@ -539 +543 @@
       return;
 
-  time = max_p + fTimeShiftLoGain /* this shifts the time to the start of the rising edge */
+  time = max_p + fTimeShiftLoGain + (Float_t)fLoGainFirst /* this shifts the time to the start of the rising edge */
       - ((Float_t)t_iter)/fBinningResolutionLoGain - time_sum/sum;
 }

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.h

@@ -32 +32 @@
   static const Int_t  fgSignalStartBinLoGain;    //! Default for fSignalStartBinLoGain (now set to: 4)
   static const TString fgNameWeightsFile;        //! "cosmics_weights.dat"
-
+  static const Float_t fgOffsetLoGain;           //! Default for fOffsetLoGain (now set to 1.8)
+  
   MArrayF fHiGainSignal;                        //! Need fast access to the signals in a float way
   MArrayF fLoGainSignal;                        //! Store them in separate arrays