Changeset 5511 for trunk/MagicSoft/Mars/msignal

Timestamp:

11/30/04 11:15:57 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractTimeAndCharge.cc (modified) (1 diff)
• MExtractTimeAndCharge.h (modified) (1 diff)
• MExtractTimeAndChargeDigitalFilter.cc (modified) (3 diffs)
• MExtractTimeAndChargeDigitalFilter.h (modified) (1 diff)
• MExtractTimeAndChargeSlidingWindow.cc (modified) (2 diffs)
• MExtractTimeAndChargeSlidingWindow.h (modified) (1 diff)
• MExtractTimeAndChargeSpline.cc (modified) (2 diffs)
• MExtractTimeAndChargeSpline.h (modified) (1 diff)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -139 +139 @@
                                 fLoGainFirst, fLoGainLast, fNumLoGainSamples);
   
-  InitArrays();
+
+  if (!InitArrays())
+    return kFALSE;
+  
   Print();
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h

@@ -40 +40 @@
                                                            fWindowSizeLoGain = windowl;  }
   
-  virtual void InitArrays() {}
+  virtual Bool_t InitArrays() { return kTRUE; }
 
   virtual void FindTimeAndChargeHiGain(Byte_t *firstused, Byte_t *logain, Float_t &sum, Float_t &dsum,

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -180 +180 @@
 // --------------------------------------------------------------------------
 //
-// PreProcess
-//
-// Calls:
-// - ReadWeightsFile(fNameWeightsFile) if the weights have not yet been set.
-// - Creates new arrays according to the extraction range
-//
-Int_t MExtractTimeAndChargeDigitalFilter::PreProcess(MParList *pList)
-{
-  if (!fWeightsSet)
-    if (!ReadWeightsFile(fNameWeightsFile))
-      return kFALSE;
-
-  return MExtractTimeAndCharge::PreProcess(pList);
-}
-
-// --------------------------------------------------------------------------
-//
 // ReInit
 //
@@ -220 +203 @@
 // Gets called in the ReInit() and initialized the arrays
 //
-void MExtractTimeAndChargeDigitalFilter::InitArrays()
+Bool_t MExtractTimeAndChargeDigitalFilter::InitArrays()
 {
   Int_t range = (Int_t)(fHiGainLast - fHiGainFirst + 1 + fHiLoLast);
@@ -226 +209 @@
   range = (Int_t)(fLoGainLast - fLoGainFirst + 1);
   fLoGainSignal.Set(range);
+
+  if (!fWeightsSet)
+    if (!ReadWeightsFile(fNameWeightsFile))
+      return kFALSE;
+
 }
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.h

@@ -53 +53 @@
 
   Bool_t ReInit(MParList *pList);
-  Int_t PreProcess(MParList *pList);
 
-  void InitArrays();
+  Bool_t InitArrays();
 
   Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSlidingWindow.cc

@@ -185 +185 @@
 // Gets called in the ReInit() and initialized the arrays
 //
-void MExtractTimeAndChargeSlidingWindow::InitArrays()
+Bool_t MExtractTimeAndChargeSlidingWindow::InitArrays()
 {
   Int_t range = (Int_t)(fHiGainLast - fHiGainFirst + 1 + fHiLoLast);
@@ -191 +191 @@
   range = (Int_t)(fLoGainLast - fLoGainFirst + 1);
   fLoGainSignal.Set(range);
+
+  return kTRUE;
+  
 }
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSlidingWindow.h

@@ -29 +29 @@
   MArrayF fLoGainSignal;                 //! Store them in separate arrays
 
-  void InitArrays();
+  Bool_t  InitArrays();
   
   Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc

@@ -293 +293 @@
 // Gets called in the ReInit() and initialized the arrays
 //
-void MExtractTimeAndChargeSpline::InitArrays()
+Bool_t MExtractTimeAndChargeSpline::InitArrays()
 {
 
@@ -315 +315 @@
   fLoGainFirstDeriv .Reset();
   fLoGainSecondDeriv.Reset();
+
+  return kTRUE;
 
 }

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.h

@@ -43 +43 @@
   Bool_t ReInit( MParList *pList );
   
-  Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
+  Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
-  void InitArrays();
+  Bool_t InitArrays();
   
   void CalcIntegralHiGain(Float_t &sum, Int_t startslice, Int_t lastslice);