Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 5359)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 5360)
@@ -32,7 +32,4 @@
 //   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,5 +81,4 @@
 // Sets: 
 // - fLoGainStartShift to fgLoGainStartShift+fgOffsetLoGain
-// - fNoiseCalculation to kFALSE 
 //
 MExtractTimeAndCharge::MExtractTimeAndCharge(const char *name, const char *title)
@@ -92,5 +88,4 @@
 
     SetLoGainStartShift();
-    SetNoiseCalculation(kFALSE);
 }
 
Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h	(revision 5359)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h	(revision 5360)
@@ -16,6 +16,4 @@
   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,7 +31,4 @@
   Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
-  Bool_t IsNoiseCalculation()   {  return fNoiseCalculation;  }
-
-    
 public:
 
@@ -41,5 +36,4 @@
   
   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;
Index: trunk/MagicSoft/Mars/msignal/MExtractor.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractor.cc	(revision 5359)
+++ trunk/MagicSoft/Mars/msignal/MExtractor.cc	(revision 5360)
@@ -50,4 +50,6 @@
 //      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,4 +98,5 @@
 // - fSaturationLimit to fgSaturationLimit
 // - fNamePedestalCam to fgNamePedestalCam
+// - fNoiseCalculation to kFALSE 
 //
 // Call:
@@ -113,4 +116,5 @@
     SetRange();
     SetSaturationLimit();
+    SetNoiseCalculation(kFALSE);
 }
 
Index: trunk/MagicSoft/Mars/msignal/MExtractor.h
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractor.h	(revision 5359)
+++ trunk/MagicSoft/Mars/msignal/MExtractor.h	(revision 5360)
@@ -25,4 +25,6 @@
 
   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,4 +56,6 @@
   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,8 +83,9 @@
   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
 };