Changeset 5570 for trunk/MagicSoft/Mars/msignal

Timestamp:

12/08/04 18:02:12 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractTimeAndCharge.cc (modified) (1 diff)
• MExtractTimeAndChargeDigitalFilter.cc (modified) (6 diffs)
• MExtractTimeAndChargeDigitalFilter.h (modified) (1 diff)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -245 +245 @@
 void MExtractTimeAndCharge::Print(Option_t *o) const
 {
-  if (IsA()==MExtractTimeAndCharge::Class())
+  if (IsA()==Class())
     *fLog << GetDescriptor() << ":" << endl;
-  
-  *fLog << dec << endl;
-  *fLog << "Taking " << fNumHiGainSamples
+
+  *fLog << dec;
+  *fLog << " Taking " << fNumHiGainSamples
         << " HiGain samples from slice " << (Int_t)fHiGainFirst
         << " to " << (Int_t)(fHiGainLast+fHiLoLast) << " incl" << endl;
-  *fLog << inf << "Taking " << fNumLoGainSamples
+  *fLog << " Taking " << fNumLoGainSamples
         << " LoGain samples from slice " << (Int_t)fLoGainFirst
         << " to " << (Int_t)fLoGainLast << " incl" << endl;

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -234 +234 @@
   const Float_t pedes  = ped.GetPedestal();
   const Float_t ABoffs = ped.GetPedestalABoffset();
-        
+
   Float_t pedmean[2];
   pedmean[0] = pedes + ABoffs;
@@ -260 +260 @@
         sat++;
     }
-  
+
   if (fHiLoLast != 0)
     {
@@ -284 +284 @@
         }
     }
-  
+
   //
   // allow one saturated slice 
@@ -300 +300 @@
         fRandomIter = 0;
       for (Int_t ids=0; ids < fWindowSizeHiGain; ids++)
-        {
+      {
           const Int_t   idx = fBinningResolutionHiGain*ids + fRandomIter;
           sum              += fAmpWeightsHiGain [idx]*fHiGainSignal[ids]; 
@@ -364 +364 @@
         }
     }
-  
+
   sum = 0.;
   time_sum = 0.;
@@ -1012 +1012 @@
 void MExtractTimeAndChargeDigitalFilter::Print(Option_t *o) const
 {
+    if (IsA()==Class())
+        *fLog << GetDescriptor() << ":" << 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;
+    *fLog << " Weights File:       " << fNameWeightsFile << endl;
 
     TString opt(o);

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.h

@@ -48 +48 @@
   MArrayF fTimeWeightsLoGain;                   //! Time weights Low-Gain (from weights file)
 
-  TString fNameWeightsFile;                     // Name of the weights file
-  Bool_t  fWeightsSet;                          // Flag if weights have alreayd been set
-  UInt_t  fRandomIter;                          // Counter used to randomize weights for noise calculation
+  TString fNameWeightsFile;                     //! Name of the weights file
+  Bool_t  fWeightsSet;                          //! Flag if weights have alreayd been set
+  UInt_t  fRandomIter;                          //! Counter used to randomize weights for noise calculation
 
   Bool_t  InitArrays();