Changeset 5368

Timestamp:

11/10/04 10:25:55 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

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

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -24 +24 @@
 !
 \* ======================================================================== */
-
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -69 +68 @@
 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 +169 @@
   // 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);

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -397 +397 @@
     }
 
+    if (IsEnvDefined(env, prefix, "NoiseCalculation", print))
+    {
+        SetNoiseCalculation(GetEnvValue(env, prefix, "NoiseCalculation", fNoiseCalculation));
+        rc = kTRUE;
+    }
+
     return rc;
 }