Changeset 5529 for trunk/MagicSoft

Timestamp:

11/30/04 20:23:31 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

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

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -180 +180 @@
 // --------------------------------------------------------------------------
 //
-// ReInit
-//
-// Calls:
-// - MExtractor::ReInit(pList);
-// - Creates new arrays according to the extraction range
-//
-Bool_t MExtractTimeAndChargeDigitalFilter::ReInit(MParList *pList)
-{
-  if (!MExtractTimeAndCharge::ReInit(pList))
-    return kFALSE;
-
-  fTimeShiftHiGain = (Float_t)fHiGainFirst + 0.5 + 1./fBinningResolutionHiGain;
-  fTimeShiftLoGain = (Float_t)fLoGainFirst + 0.5 + 1./fBinningResolutionLoGain;
-  
-  return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
 // InitArrays
 //
@@ -218 +199 @@
       return kFALSE;
 
+  fTimeShiftHiGain = (Float_t)fHiGainFirst + 0.5 + 1./fBinningResolutionHiGain;
+  fTimeShiftLoGain = (Float_t)fLoGainFirst + 0.5 + 1./fBinningResolutionLoGain;
+  
   return kTRUE;
 }
@@ -384 +368 @@
     const Int_t   idx = fBinningResolutionHiGain*sample + fBinningResolutionHalfHiGain + t_iter;
     const Int_t   ids = max_p + sample;
-    
     const Float_t pex = ids < 0 ? 0. : ( ids >= range ? 0. : fHiGainSignal[ids]);
     sum              += fAmpWeightsHiGain [idx]*pex; 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.h

@@ -52 +52 @@
   UInt_t  fRandomIter;                          // Counter used to randomize weights for noise calculation
 
-  Bool_t ReInit(MParList *pList);
+  Bool_t  InitArrays();
 
-  Bool_t InitArrays();
-
-  Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
+  Int_t   ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
 public: