Changeset 5723 for trunk/MagicSoft/Mars

Timestamp:

01/07/05 16:22:52 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• msignal/MExtractTimeAndChargeDigitalFilter.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
      - Added #include "TSystem.h", otherwise gSystem is not recognized
        in Mac OSX.
+
    * manalysis/MMakePadHistograms.cc
      - Changed badcalc.SetNamePedPhotContainer to 
        badcalc.SetNamePedPhotCam
+
+
 
  2005/01/07 Thomas Bretz
@@ -58 +61 @@
    * manalysis/Makefile:
      - removed unintantionally introduced wrong include
+
+   * msignal/MExtractTimeAndChargeDigitalFilter.cc:
+     - a small acceleration discussed with Hendrik by replacing a
+       counter in a loop by pointer arithmetics
 
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -227 +227 @@
   Byte_t maxpos = 0;
   Byte_t max    = 0;
-  Int_t count   = 0;
 
   //
@@ -235 +234 @@
   const Float_t ABoffs = ped.GetPedestalABoffset();
 
-  Float_t pedmean[2];
-  pedmean[0] = pedes + ABoffs;
-  pedmean[1] = pedes - ABoffs;
+  const Float_t pedmean[2] = { pedes + ABoffs, pedes - ABoffs };
 
   //
   // Check for saturation in all other slices
   //
+  Int_t ids = fHiGainFirst;
+  Float_t *sample = fHiGainSignal.GetArray();
   while (p<end)
     {
-
-      const Int_t ids      = fHiGainFirst + count ;
-      const Float_t signal = (Float_t)*p - pedmean[(ids+abflag) & 0x1];
-      fHiGainSignal[count] = signal;
-
-      count++;
+      *sample++ = (Float_t)*p - pedmean[(ids++ + abflag) & 0x1];
 
       if (*p > max)
@@ -266 +260 @@
       end = logain + fHiLoLast;
 
+      ids = fHiGainFirst;
+      sample = fHiGainSignal.GetArray();
       while (logain<end)
         {
 
-          const Int_t ids      = fHiGainFirst + range ;
-          const Float_t signal = (Float_t)*logain - pedmean[(ids+abflag) & 0x1];
-          fHiGainSignal[range] = signal;
+          *sample++ = (Float_t)*logain - pedmean[(ids++ + abflag) & 0x1];
           range++;
 
@@ -402 +396 @@
   Byte_t maxpos = 0;
   Byte_t max    = 0;
-  Int_t count   = 0;
 
   //
@@ -410 +403 @@
   const Float_t ABoffs = ped.GetPedestalABoffset();
         
-  Float_t pedmean[2];
-  pedmean[0] = pedes + ABoffs;
-  pedmean[1] = pedes - ABoffs;
+  const Float_t pedmean[2] = { pedes + ABoffs, pedes - ABoffs };
 
   //
   // Check for saturation in all other slices
   //
+  Float_t *sample = fLoGainSignal.GetArray();
+  Int_t    ids    = fLoGainFirst;
   while (p<end)
     {
-
-      const Int_t ids      = fLoGainFirst + count ;
-      const Float_t signal = (Float_t)*p - pedmean[(ids+abflag) & 0x1];
-      fLoGainSignal[count] = signal;
-
-      count++;
+      *sample++ = (Float_t)*p - pedmean[(ids++ + abflag) & 0x1];
 
       if (*p > max)