Changeset 5608 for trunk

Timestamp:

12/16/04 11:38:26 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc

@@ -613 +613 @@
       // First, find the right FADC slice:
       // 
-      klo  = maxpos - 1;
+      klo  = maxpos;
       while (klo >= 0)
         {
+          klo--;
           if (fHiGainSignal[klo] < fHalfMax)
             break;
-          klo--;
-        }
-      
+        }
+      
+      khi = klo+1;
       //
       // Loop from the beginning of the slice upwards to reach the fHalfMax:
@@ -632 +633 @@
       Bool_t back = kFALSE;
       
-      Int_t maxcnt = 50;
+      Int_t maxcnt = 20;
       Int_t cnt    = 0;
 
@@ -985 +986 @@
       // First, find the right FADC slice:
       // 
-      klo  = maxpos - 1;
-      while (klo >= 0)
-        {
+      klo  = maxpos;
+      while (klo > 0)
+        {
+          klo--;
           if (fLoGainSignal[klo] < fHalfMax)
             break;
-          klo--;
-        }
-      
+        }
+      
+      khi = klo+1;
       //
       // Loop from the beginning of the slice upwards to reach the fHalfMax:
@@ -1004 +1006 @@
       Bool_t back = kFALSE;
       
-      Int_t maxcnt = 50;
+      Int_t maxcnt = 20;
       Int_t cnt    = 0;
 
@@ -1034 +1036 @@
 
           if (++cnt > maxcnt)
-            {
-              //              *fLog << inf << x << "  " << y << " " << fHalfMax << endl;
-              break;
-            }
+            break;
           
           step /= 2.;
         }
 
-      time  = x + (Int_t)fLoGainFirst;
+      time  = x + (Float_t)fLoGainFirst;
       dtime = fResolution;
     }
@@ -1151 +1150 @@
   Float_t b = start-lo;
 
+  Int_t cnt = 0;
+
   while (1)
     {
@@ -1171 +1172 @@
             + (a*a*a-a)*fHiGainSecondDeriv[klo] 
             + (b*b*b-b)*fHiGainSecondDeriv[khi];
+          
+          cnt++;
         }