Changeset 5149

Timestamp:

09/30/04 13:40:10 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/09/30: Hendrik Bartko, Markus Gaug
+  
+   * msignal/MExtractFixedWindowSpline.cc
+     - corrected a small bug for the case that the high-gain extraction 
+       window ranges into the low-gain
+
 
  2004/09/29: Hendrik Bartko, Diego Tescaro, Markus Gaug

trunk/MagicSoft/Mars/msignal/MExtractFixedWindowSpline.cc

@@ -271 +271 @@
   else
     {
+
+      //
+      // There are two overlap slices which we have to treat sepatately
+      // 
+      // First, the last high-gain slice as center 
+      //
       summ += *ptr;
       i++;
@@ -278 +284 @@
       fHiGainFirstDeriv [i] = *(logain) - 2.* *(ptr) + *(ptr-1);
       fHiGainFirstDeriv [i] = (6.0*fHiGainFirstDeriv[i]-fHiGainFirstDeriv[i-1])/pp;
-
-      end    = logain + fHiLoLast - 1;
-
-      while (logain<end)
+      
+      if (fHiLoLast == 1)
         {
-
+          sum += (Float_t)*logain/2;
+          fHiGainSecondDeriv[++i] = 0.;
+          if (*logain >= fSaturationLimit)
+            sat++;
+        }
+      else
+        {
+          // 
+          // Second, the first low-gain slice as center 
+          //
           summ += *logain;
           i++;
@@ -289 +302 @@
           pp = fHiGainSecondDeriv[i-1] + 4.;
           fHiGainSecondDeriv[i] = -1.0/pp;
-          fHiGainFirstDeriv [i] = *(logain+1) - 2.* *(logain) + *(ptr-1);
+          fHiGainFirstDeriv [i] = *(logain+1) - 2.* *(logain) + *(ptr);
           fHiGainFirstDeriv [i] = (6.0*fHiGainFirstDeriv[i]-fHiGainFirstDeriv[i-1])/pp;
-
+          
           if (*logain++ >= fSaturationLimit)
             sat++;
           
+          end  = logain + fHiLoLast - 2;
+          
+          while (logain<end)
+            {
+              
+              summ += *logain;
+              i++;
+              
+              pp = fHiGainSecondDeriv[i-1] + 4.;
+              fHiGainSecondDeriv[i] = -1.0/pp;
+              fHiGainFirstDeriv [i] = *(logain+1) - 2.* *(logain) + *(logain-1);
+              fHiGainFirstDeriv [i] = (6.0*fHiGainFirstDeriv[i]-fHiGainFirstDeriv[i-1])/pp;
+              
+              if (*logain++ >= fSaturationLimit)
+                sat++;
+              
+            }
+          sum += (Float_t)*logain/2;
+          fHiGainSecondDeriv[++i] = 0.;
         }
-      sum += (Float_t)*logain/2;
-      fHiGainSecondDeriv[++i] = 0.;
-    }
-
+    }
+  
   for (Int_t k=range-2;k>0;k--)
     {