Changeset 5833 for trunk

Timestamp:

01/14/05 10:28:56 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractTimeAndChargeDigitalFilter.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2005/01/14 Markus Gaug
+
+   * msignal/MExtractTimeAndChargeDigitalFilter.cc
+     - added a small acceleration of the program, tested by Hendrik and
+       me.
 
  2005/01/14 Thomas Bretz

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -246 +246 @@
 
   Int_t range = fHiGainLast - fHiGainFirst + 1;
+  Int_t  maxpos = 0;
   
   const Byte_t *end = ptr + range;
   Byte_t *p     = ptr;
-  Byte_t maxpos = 0;
   Byte_t max    = 0;
 
@@ -309 +309 @@
   if (sat > 0)
     return;
-
+  
   //
   // Slide with a window of size fWindowSizeHiGain over the sample 
@@ -327 +327 @@
     }
   
+  dtime = 1.0;
+  const Int_t uplim = range-fWindowSizeHiGain+1;
+
+  if (maxpos > uplim)
+    {
+      time = uplim+1;
+      return;
+    }
+  
+  maxpos -= 3;
+  
+  if (maxpos < 0)
+    {
+      time = 0.;
+      return;
+    }
+      
   Float_t time_sum  = 0.;
   Float_t fmax      = 0.;
@@ -333 +350 @@
   
   //
-  // Calculate the sum of the first fWindowSize slices
-  //
-  for (Int_t i=0;i<range-fWindowSizeHiGain+1;i++)
+  // Perform first only 3 temptative calculations around the maximum!
+  //
+  for (Int_t i=maxpos; i<maxpos+fWindowSizeHiGain+3;i++)
     {
       sum      = 0.;
@@ -358 +375 @@
         max_p     = i;
       }
-    } /*   for (Int_t i=0;i<range-fWindowSizeHiGain+1;i++) */
+    } /*   for (Int_t i=maxpos;i<maxpos+fWindowSizeHiGain+3;i++) */
 
   time = 0;
@@ -419 +436 @@
   const Byte_t *end = ptr + range;
   Byte_t *p     = ptr;
-  Byte_t maxpos = 0;
-  Byte_t max    = 0;
-
   //
   // Prepare the low-gain pedestal
@@ -438 +452 @@
     {
       *sample++ = (Float_t)*p - pedmean[(ids++ + abflag) & 0x1];
-
-      if (*p > max)
-        {
-          max    = *p;
-          maxpos =  p-ptr;
-        }
 
       if (*p++ >= fSaturationLimit)