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

Timestamp:

11/28/04 18:22:38 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

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;
+
+  Print();
+
+  return MExtractTimeAndCharge::PreProcess(pList);
+}
+
+// --------------------------------------------------------------------------
+//
 // ReInit
 //
@@ -191 +211 @@
         return kFALSE;
 
-    if (!fWeightsSet)
-      if (!ReadWeightsFile(fNameWeightsFile));
-        return kFALSE;
-
     fHiGainSignal.Set(fHiGainLast - fHiGainFirst + 1 + fHiLoLast);
     fLoGainSignal.Set(fLoGainLast - fLoGainFirst + 1);
@@ -204 +220 @@
 }
 
-Int_t MExtractTimeAndChargeDigitalFilter::PreProcess(MParList *pList)
-{
-    *fLog << endl;
-    *fLog << inf << "Using the following weights: " << endl;
-    *fLog << "Hi-Gain:" << endl;
-
-    for (Int_t i=0; i<fBinningResolutionHiGain*fWindowSizeHiGain; i++)
-        *fLog << " " << fAmpWeightsHiGain[i] << " \t " << fTimeWeightsHiGain[i] << endl;
-
-    *fLog << "Lo-Gain:" << endl;
-
-    for (Int_t i=0; i<fBinningResolutionLoGain*fWindowSizeLoGain; i++)
-        *fLog << " " << fAmpWeightsLoGain[i] << " \t " << fTimeWeightsLoGain[i] << endl;
-
-    return MExtractTimeAndCharge::PreProcess(pList);
-}
 
 void MExtractTimeAndChargeDigitalFilter::FindTimeAndChargeHiGain(Byte_t *ptr, Byte_t *logain, Float_t &sum, Float_t &dsum, 
@@ -994 +994 @@
     *fLog << " Binning Res LoGain: " << fBinningResolutionHiGain << endl;
   
+    *fLog << endl;
+    *fLog << inf << "Using the following weights: " << endl;
+    *fLog << "Hi-Gain:" << endl;
+    for (Int_t i=0; i<fBinningResolutionHiGain*fWindowSizeHiGain; i++)
+      *fLog << " " << fAmpWeightsHiGain[i] << " \t " << fTimeWeightsHiGain[i] << endl;
+    
+    *fLog << "Lo-Gain:" << endl;
+    for (Int_t i=0; i<fBinningResolutionLoGain*fWindowSizeLoGain; i++)
+      *fLog << " " << fAmpWeightsLoGain[i] << " \t " << fTimeWeightsLoGain[i] << endl;
+    
     MExtractTimeAndCharge::Print(o);
 }