Changeset 5364 for trunk/MagicSoft/Mars

Timestamp:

11/09/04 19:26:25 (20 years ago)

Author:

hbartko

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MC_weights.dat (added)
• msignal/MExtractTimeAndChargeDigitalFilter.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
        weights are quasi randomly chosen and applied to the first slices
        available in the set range
+   * msignal/MC_weights.dat
+    - new weights file using 6 slices for the digital filter, especially
+      made for MC pulses
 
  2004/11/09: Markus Gaug

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -307 +307 @@
       }
 
+      //  if (IsNoiseCalculation()) return;
+
       if (sum>fmax)
       {
@@ -340 +342 @@
   
   sum = 0.;
+  time_sum = 0.;
   //
   // Slide with a window of size fWindowSizeHiGain over the sample 
@@ -347 +350 @@
   {
     const Int_t   idx = fBinningResolutionHiGain*sample + fBinningResolutionHalfHiGain + t_iter;
-    const Int_t   ids = max_p + sample;
+    const Int_t   ids = (IsNoiseCalculation()) ? sample : max_p + sample;
+    
     const Float_t pex = ids < 0 ? 0. : 
       ( ids > range ? 0. : fHiGainSignal[ids]-pedmean[(ids+abflag) & 0x1]);
@@ -456 +460 @@
   
   sum = 0.;
+  time_sum = 0.;
 
   //
@@ -464 +469 @@
   {
     const Int_t   idx = fBinningResolutionLoGain*sample + fBinningResolutionHalfLoGain + t_iter;
-    const Int_t   ids = max_p + sample;
+    const Int_t   ids = (IsNoiseCalculation()) ? sample : max_p + sample;;
     const Float_t pex = ids < 0 ? 0. : 
       ( ids > range ? 0. : fLoGainSignal[ids]-pedmean[(ids+abflag) & 0x1]);