Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc	(revision 5367)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc	(revision 5368)
@@ -24,5 +24,4 @@
 !
 \* ======================================================================== */
-
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -69,15 +68,14 @@
 using namespace std;
 
-const Byte_t MExtractTimeAndChargeDigitalFilter::fgHiGainFirst       =  0;
-const Byte_t MExtractTimeAndChargeDigitalFilter::fgHiGainLast        = 14;
-const Byte_t MExtractTimeAndChargeDigitalFilter::fgLoGainFirst       =  3;
-const Byte_t MExtractTimeAndChargeDigitalFilter::fgLoGainLast        = 14;
-const Int_t  MExtractTimeAndChargeDigitalFilter::fgWindowSizeHiGain  = 6;
-const Int_t  MExtractTimeAndChargeDigitalFilter::fgWindowSizeLoGain  = 6;
+const Byte_t MExtractTimeAndChargeDigitalFilter::fgHiGainFirst             =  0;
+const Byte_t MExtractTimeAndChargeDigitalFilter::fgHiGainLast              = 14;
+const Byte_t MExtractTimeAndChargeDigitalFilter::fgLoGainFirst             =  3;
+const Byte_t MExtractTimeAndChargeDigitalFilter::fgLoGainLast              = 14;
+const Int_t  MExtractTimeAndChargeDigitalFilter::fgWindowSizeHiGain        =  6;
+const Int_t  MExtractTimeAndChargeDigitalFilter::fgWindowSizeLoGain        =  6;
 const Int_t  MExtractTimeAndChargeDigitalFilter::fgBinningResolutionHiGain = 10;
 const Int_t  MExtractTimeAndChargeDigitalFilter::fgBinningResolutionLoGain = 10;
-const Int_t  MExtractTimeAndChargeDigitalFilter::fgSignalStartBinHiGain = 4;
-const Int_t  MExtractTimeAndChargeDigitalFilter::fgSignalStartBinLoGain = 4;
-
+const Int_t  MExtractTimeAndChargeDigitalFilter::fgSignalStartBinHiGain    =  4;
+const Int_t  MExtractTimeAndChargeDigitalFilter::fgSignalStartBinLoGain    =  4;
 // --------------------------------------------------------------------------
 //
@@ -171,6 +169,6 @@
   // size of 6. The exact numbers have to be found still.
   //
-  fNumHiGainSamples = (Float_t)fWindowSizeHiGain/2.5;
-  fNumLoGainSamples = (Float_t)fWindowSizeLoGain/2.5;
+  fNumHiGainSamples = (Float_t)fWindowSizeHiGain/1.4;
+  fNumLoGainSamples = (Float_t)fWindowSizeLoGain/1.4;
   fSqrtHiGainSamples = TMath::Sqrt(fNumHiGainSamples);
   fSqrtLoGainSamples = TMath::Sqrt(fNumLoGainSamples);
Index: trunk/MagicSoft/Mars/msignal/MExtractor.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractor.cc	(revision 5367)
+++ trunk/MagicSoft/Mars/msignal/MExtractor.cc	(revision 5368)
@@ -397,4 +397,10 @@
     }
 
+    if (IsEnvDefined(env, prefix, "NoiseCalculation", print))
+    {
+        SetNoiseCalculation(GetEnvValue(env, prefix, "NoiseCalculation", fNoiseCalculation));
+        rc = kTRUE;
+    }
+
     return rc;
 }