Changeset 5360 for trunk

Timestamp:

11/09/04 18:30:53 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractTimeAndCharge.cc (modified) (3 diffs)
• MExtractTimeAndCharge.h (modified) (3 diffs)
• MExtractor.cc (modified) (3 diffs)
• MExtractor.h (modified) (3 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -32 +32 @@
 //   substract the pedestal value.
 //
-//   If the flag fNoiseCalculation is set, the signal extractor should 
-//   calculate the pure noise contriubtion from a fixed window in time.
-//
 //   The following variables have to be set by the derived class and 
 //   do not have defaults:
@@ -84 +81 @@
 // Sets: 
 // - fLoGainStartShift to fgLoGainStartShift+fgOffsetLoGain
-// - fNoiseCalculation to kFALSE 
 //
 MExtractTimeAndCharge::MExtractTimeAndCharge(const char *name, const char *title)
@@ -92 +88 @@
 
     SetLoGainStartShift();
-    SetNoiseCalculation(kFALSE);
 }
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h

@@ -16 +16 @@
   Float_t fLoGainStartShift;      // Shift to start searching the low-gain signal obtained from the high-gain times.
 
-  Bool_t  fNoiseCalculation;      // Flag if the extractor is used to determine the noise contribution from a pedestal file.
-  
 protected:
 
@@ -33 +31 @@
   Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
-  Bool_t IsNoiseCalculation()   {  return fNoiseCalculation;  }
-
-    
 public:
 
@@ -41 +36 @@
   
   void SetLoGainStartShift( const Float_t f=fgLoGainStartShift )  { fLoGainStartShift = f + fOffsetLoGain;  }
-  void SetNoiseCalculation( const Bool_t b=kFALSE              )  { fNoiseCalculation = b;   }
     
   void Print(Option_t *o) const;

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -50 +50 @@
 //      created in PreProcess and Process) are written
 //    - the version number is maintained!
+//    - If the flag fNoiseCalculation is set, the signal extractor should 
+//      calculate the pure noise contriubtion from a fixed window in time.
 //
 //
@@ -96 +98 @@
 // - fSaturationLimit to fgSaturationLimit
 // - fNamePedestalCam to fgNamePedestalCam
+// - fNoiseCalculation to kFALSE 
 //
 // Call:
@@ -113 +116 @@
     SetRange();
     SetSaturationLimit();
+    SetNoiseCalculation(kFALSE);
 }
 

trunk/MagicSoft/Mars/msignal/MExtractor.h

@@ -25 +25 @@
 
   static const Float_t fgOffsetLoGain;     //! Default for fOffsetLoGain (now set to 1.51 (= 5ns)
+  
+  Bool_t  fNoiseCalculation;      // Flag if the extractor is used to determine the noise contribution from a pedestal file.
   
 protected:
@@ -54 +56 @@
   Byte_t   fSaturationLimit;               // Highest FADC slice value until being declared saturated
   TString  fNamePedestalCam;              // Name of the 'MPedestalCam' container
+
+  Bool_t IsNoiseCalculation()   {   return fNoiseCalculation;   }
   
   virtual void FindSignalHiGain(Byte_t *firstused, Byte_t *lowgain, Float_t &sum, Byte_t &sat) const { }
@@ -79 +83 @@
   void SetSaturationLimit  ( Byte_t       lim=fgSaturationLimit        ) { fSaturationLimit  = lim;  }
   void SetNamePedestalCam ( const char *name=fgNamePedestalCam.Data()) { fNamePedestalCam = name; }
+  void SetNoiseCalculation( const Bool_t b=kFALSE )   {   fNoiseCalculation = b;   }
 
   void Print(Option_t *o="") const;
 
-  ClassDef(MExtractor, 2) // Signal Extractor Base Class
+  ClassDef(MExtractor, 3) // Signal Extractor Base Class
 };