Changeset 17835 for trunk/Mars/msignal

Timestamp:

05/11/14 21:25:21 (11 years ago)

Author:

tbretz

Message:

First working version.

File:

• trunk/Mars/msignal/MExtractFACT.cc (modified) (4 diffs)

trunk/Mars/msignal/MExtractFACT.cc

@@ -150 +150 @@
         }
 
+        //Float_t max = *pmax;
+
         // -------------------------------------------------------------------------
         // Calculate a parabola through this and the surrounding points
@@ -171 +173 @@
         if (pmax>pbeg && pmax<pend-1)
         {
-            const double &v1 = pmax[-1];
-            const double &v2 = pmax[0];
-            const double &v3 = pmax[+1];
+            const Float_t &v1 = pmax[-1];
+            const Float_t &v2 = pmax[ 0];
+            const Float_t &v3 = pmax[+1];
             if (v1>0 && v2>0 && v3>0)
             {
@@ -190 +192 @@
                     if (dx>=-1 && dx<=1)
                     {
-                        max = a + b*dx + c*dx*dx;
+                        max = exp(a + b*dx + c*dx*dx);
+
+                        // Time is position of maximum
                         //time = dx;
                         //time += Int_t(pmax-ptr);
@@ -202 +206 @@
         {
             // -10: maximum search window
+
+            // Time is position of half hight leading edge
             pend = std::max(pbeg, pmax-10);
             for (;pmax>=pend; pmax--)