Changeset 5416 for trunk/MagicSoft/Mars

Timestamp:

11/17/04 10:05:26 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractTimeAndChargeSlidingWindow.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -39 +39 @@
      - adapt the histogram ranges slightly because I have found high 
        intensity calibration events creating non desired overflows.
+
+   * msignal/MExtractTimeAndChargeSlidingWindow.cc
+     - fixed a bug in the setting of the window which set always the
+       default before.
 
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSlidingWindow.cc

@@ -150 +150 @@
 {
   
-  const Byte_t availhirange = (fHiGainLast-fHiGainFirst+1) & ~1;
+  fWindowSizeHiGain = windowh;
+  fWindowSizeLoGain = windowl;
+
+  const Byte_t availhirange = fHiGainLast-fHiGainFirst+1;
 
   if (fWindowSizeHiGain > availhirange)
@@ -162 +165 @@
     }
   
-  if (fWindowSizeHiGain<2) 
-    {
-      fWindowSizeHiGain = 2;
-      *fLog << warn << GetDescriptor() << ": High Gain window size too small, set to two samples" << endl;
+  if (fWindowSizeHiGain<1) 
+    {
+      fWindowSizeHiGain = 1;
+      *fLog << warn << GetDescriptor() << ": High Gain window size too small, set to one sample" << endl;
     }
   
   if (fLoGainLast != 0 && fWindowSizeLoGain != 0)
     {
-      const Byte_t availlorange = (fLoGainLast-fLoGainFirst+1) & ~1;
+      const Byte_t availlorange = fLoGainLast-fLoGainFirst+1;
       
       if (fWindowSizeLoGain > availlorange)
@@ -180 +183 @@
                 << ": Will set window size to: " << (int)availlorange << endl;
           fWindowSizeLoGain = availlorange;
-        }
-      
-      if (fWindowSizeLoGain<2) 
-        {
-          fWindowSizeLoGain = 2;
-          *fLog << warn << GetDescriptor() << ": Low Gain window size too small set to two samples" << endl;
         }
     }