Changeset 5294 for trunk/MagicSoft

Timestamp:

10/20/04 11:48:20 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractTimeFastSpline.cc (modified) (19 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
      - fixed a small bug concerning the way the second derivatives are 
        calculated. The effect is less than 1% on the time resolution
+
+   * msignal/MExtractTimeFastSpline.cc
+     - comment the search for the half maximum and use the maximum again. 
+       The half maximum fails sometimes by 0.5 slices which seems to be 
+       some intrinsic behavior of the calibration pulses. 
+       The maximum seems to be OK, though. 
 
 

trunk/MagicSoft/Mars/msignal/MExtractTimeFastSpline.cc

@@ -53 +53 @@
 const Byte_t  MExtractTimeFastSpline::fgLoGainLast   = 14;
 const Float_t MExtractTimeFastSpline::fgResolution   = 0.003;
-const Float_t MExtractTimeFastSpline::fgRiseTime     = 1.5;
+const Float_t MExtractTimeFastSpline::fgRiseTime     = 2.;
 
 // --------------------------------------------------------------------------
@@ -168 +168 @@
   // Check for saturation in all other slices
   //
-  while (++p<end)
+  while (p<end)
     {
       if (*p > max)
@@ -176 +176 @@
         }
 
-      if (*p >= fSaturationLimit)
+      if (*p++ >= fSaturationLimit)
         {
           sat++;
@@ -183 +183 @@
     }
   
-  if (sat)
+  //
+  // allow one saturated slice 
+  //
+  if (sat > 1)
     return;
 
-  if (maxpos < 2)
-    return;
+  if (maxpos < 1)
+    {
+      time = -999.;
+      return;
+    }
   
   Float_t pp;
@@ -200 +206 @@
       pp = fHiGainSecondDeriv[i-1] + 4.;
       fHiGainSecondDeriv[i] = -1.0/pp;
-      const Double_t deriv = *(p+1) - 2.* *(p) + *(p-1);
-      fHiGainFirstDeriv [i] = (6.0*deriv-fHiGainFirstDeriv[i-1])/pp;
+      fHiGainFirstDeriv [i] = *(p+1) - 2.* *(p) + *(p-1);
+      fHiGainFirstDeriv [i] = (6.0*fHiGainFirstDeriv[i]-fHiGainFirstDeriv[i-1])/pp;
     }
 
@@ -229 +235 @@
 
   //
-  // Search for the maximum, starting in interval maxpos-1. If no maximum is found, go to 
-  // interval maxpos+1.
-  //
-
+  // Search for the maximum, starting in interval maxpos-1 in steps of 0.2 till maxpos-0.2.
+  // If no maximum is found, go to interval maxpos+1.
+  //
   Float_t higainklo = fHiGainSecondDeriv[klo];
   Float_t higainkhi = fHiGainSecondDeriv[khi];
-  while (x<upper-0.3)
+
+  while ( x < upper - 0.3 )
     {
       
@@ -254 +260 @@
     }
   
-
- if (time > upper-0.1)
+  //
+  // Search for the absolute maximum from maxpos to maxpos+1 in steps of 0.2
+  //
+  if (time > upper-0.1)
     {
 
@@ -270 +278 @@
       higainklo = fHiGainSecondDeriv[klo];
       higainkhi = fHiGainSecondDeriv[khi];
+
       while (x<upper-0.3)
         {
@@ -289 +298 @@
         }
   }
- 
-  const Float_t up = time+step-0.055;
-  const Float_t lo = time-step+0.055;
+
+  //
+  // Now, the time, abmax and khicont and klocont are set correctly within the previous precision.
+  // Try a better precision. 
+  //
+  const Float_t up = time+step-0.035;
+  const Float_t lo = time-step+0.035;
   const Float_t maxpossave = time;
-
+  
   x     = time;
   a     = upper - x;
   b     = x - lower;
 
-  step  = 0.04; // step size of 83 ps 
+  step  = 0.025; // step size of 83 ps 
 
   higainklo = fHiGainSecondDeriv[klo];
   higainkhi = fHiGainSecondDeriv[khi];
-  while (x<up)
+
+  //
+  // First, try from time up to time+0.2 in steps of 83ps.
+  //
+  while ( x < up )
     {
 
@@ -322 +339 @@
     }
 
-  if (time < klo + 0.02)
+
+  //
+  // Second, try from time down to time-0.2 in steps of 0.04.
+  //
+  x     = maxpossave;
+  //
+  // Test the possibility that the absolute maximum has not been found between
+  // maxpos and maxpos+0.02, then we have to look between maxpos-0.02 and maxpos
+  // which requires new setting of klocont and khicont
+  //
+  if (x < klo + 0.02)
     {
       klo--;
@@ -332 +359 @@
     }
   
-  x     = maxpossave;
   a     = upper - x;
   b     = x - lower;
@@ -338 +364 @@
   higainklo = fHiGainSecondDeriv[klo];
   higainkhi = fHiGainSecondDeriv[khi];
-  while (x>lo)
+
+  while ( x > lo )
     {
 
@@ -360 +387 @@
   const Float_t halfmax = pedes + (abmax - pedes)/2.;
 
+#if 0
   //
   // Now, loop from the maximum bin leftward down in order to find the position of the half maximum.
@@ -381 +409 @@
   klocont = (Float_t)*(first+klo);
   khicont = (Float_t)*(first+klo+1);
-  time  = x;
 
   step = 0.5;
@@ -415 +442 @@
       
     }
-
   time  = (Float_t)fHiGainFirst + x;
-  dtime = fResolution;
+
+#endif
+  dtime = 0.035;
+
 }
 
@@ -431 +460 @@
   const Int_t range = fLoGainLast - fLoGainFirst + 1;
   const Byte_t *end = first + range;
-  Byte_t *p = first;
+  Byte_t       *p   = first;
   Byte_t max    = 0;
   Byte_t maxpos = 0;
@@ -438 +467 @@
   // Check for saturation in all other slices
   //
-  while (++p<end)
+  while (p<end)
     {
       if (*p > max)
@@ -446 +475 @@
         }
 
-      if (*p >= fSaturationLimit)
+      if (*p++ >= fSaturationLimit)
         {
           sat++;
@@ -456 +485 @@
     return;
 
-  if (maxpos < 2)
+  if (maxpos < 1)
     return;