Changeset 5558 for trunk/MagicSoft/Mars/msignal

Timestamp:

12/03/04 20:17:06 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractTime.cc (modified) (1 diff)
• MExtractTimeAndCharge.cc (modified) (3 diffs)
• MExtractTimeAndChargeDigitalFilter.cc (modified) (1 diff)
• MExtractor.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTime.cc

@@ -215 +215 @@
 void MExtractTime::Print(Option_t *o) const
 {
-    *fLog << all;
     if (IsA()==MExtractTime::Class())
         *fLog << GetDescriptor() << ":" << endl;

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -115 +115 @@
   if (!fSignals)
       return kFALSE;
+
+  *fLog << flush << inf;
+  Print();
   
   return kTRUE;
@@ -141 +144 @@
     fSignals->SetUsedFADCSlices(fHiGainFirst, fHiGainLast+fHiLoLast, fNumHiGainSamples,
                                 fLoGainFirst, fLoGainLast, fNumLoGainSamples);
-  
-  Print();
 
   return kTRUE;
@@ -244 +245 @@
 void MExtractTimeAndCharge::Print(Option_t *o) const
 {
-
-  *fLog << all;
   if (IsA()==MExtractTimeAndCharge::Class())
     *fLog << GetDescriptor() << ":" << endl;
   
   *fLog << dec << endl;
-  *fLog << inf << "Taking " << fNumHiGainSamples
+  *fLog << "Taking " << fNumHiGainSamples
         << " HiGain samples from slice " << (Int_t)fHiGainFirst
         << " to " << (Int_t)(fHiGainLast+fHiLoLast) << " incl" << endl;

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -1012 +1012 @@
 void MExtractTimeAndChargeDigitalFilter::Print(Option_t *o) const
 {
-
-  *fLog << all;
-  *fLog << GetDescriptor() << ":" << endl;
-
-  MExtractTimeAndCharge::Print(o);
-  *fLog << " Time Shift HiGain:  " << fTimeShiftHiGain << endl;
-  *fLog << " Time Shift LoGain:  " << fTimeShiftLoGain << endl;
-  *fLog << " Window Size HiGain: " << fWindowSizeHiGain << endl;
-  *fLog << " Window Size LoGain: " << fWindowSizeLoGain << endl;
-  *fLog << " Binning Res HiGain: " << fBinningResolutionHiGain << endl;
-  *fLog << " Binning Res LoGain: " << fBinningResolutionHiGain << endl;
-  *fLog << " Weights File:       " << fNameWeightsFile.Data() << endl;
-  
-  TString opt(o);
-  if (!opt.Contains("weights"))
-    return;
-  
-  *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);
+    *fLog << " Time Shift  HiGain: " << fTimeShiftHiGain         << "  LoGain: " << fTimeShiftLoGain << endl;
+    *fLog << " Window Size HiGain: " << fWindowSizeHiGain        << "  LoGain: " << fWindowSizeLoGain << endl;
+    *fLog << " Binning Res HiGain: " << fBinningResolutionHiGain << "  LoGain: " << fBinningResolutionHiGain << endl;
+    *fLog << " Weights File:       " << fNameWeightsFile.Data() << endl;
+
+    TString opt(o);
+    if (!opt.Contains("weights"))
+        return;
+
+    *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;
 }

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -412 +412 @@
 void MExtractor::Print(Option_t *o) const
 {
-    *fLog << all;
-
     if (IsA()==MExtractor::Class())
         *fLog << GetDescriptor() << ":" << endl;
@@ -419 +417 @@
     *fLog << " Hi Gain Range:  " << (int)fHiGainFirst << " " << (int)fHiGainLast << endl;
     *fLog << " Lo Gain Range:  " << (int)fLoGainFirst << " " << (int)fLoGainLast << endl;
-    *fLog << " Num Samples Hi: " << fNumHiGainSamples << endl;
-    *fLog << " Num Samples Lo: " << fNumHiGainSamples << endl;
     *fLog << " Saturation Lim: " << (int)fSaturationLimit << endl;
-}
+    *fLog << " Num Samples HiGain: " << fNumHiGainSamples << "  LoGain: " << fNumLoGainSamples << endl;
+}