Changeset 8308 for trunk/MagicSoft/Mars/mextralgo/MExtralgoSpline.cc

Timestamp:

02/06/07 09:10:59 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mextralgo/MExtralgoSpline.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mextralgo/MExtralgoSpline.cc

@@ -126 +126 @@
         x = x3;
 
-    return x<0 ? -1 : x+i;
+    return x<0 ? -2 : x+i;
 }
 
@@ -132 +132 @@
 //
 // Search analytically downward for the value y of the spline, starting
-// at x, until x==0. If y is not found -1 is returned.
+// at x, until x==0. If y is not found -2 is returned.
 //
 Double_t MExtralgoSpline::SearchY(Float_t x, Float_t y) const
@@ -142 +142 @@
     Double_t rc = FindY(i, y, 0, x-i);
     while (--i>=0 && rc<0)
+        rc = FindY(i, y);
+
+    return rc;
+}
+
+Double_t MExtralgoSpline::SearchYup(Float_t x, Float_t y) const
+{
+    if (x<0)
+        x = 0.0001;
+
+    Int_t i = TMath::FloorNint(x);
+    Double_t rc = FindY(i, y, x-i, 1.);
+    while (i++<fNum-1 && rc<0)
         rc = FindY(i, y);
 
@@ -227 +240 @@
 }
 
-void MExtralgoSpline::Extract(Byte_t sat, Int_t maxbin)
+void MExtralgoSpline::Extract(Byte_t sat, Int_t maxbin, Bool_t width)
 {
     fSignal    =  0;
     fTime      =  0;
+    fWidth     =  0;
     fSignalDev = -1;
     fTimeDev   = -1;
+    fWidthDev  = -1;
 
     if (fNum<2)
@@ -381 +396 @@
     }*/
 
-    Float_t maxpos, maxval;
+    Float_t maxpos;
     // FIXME: Check the default if no maximum found!!!
-    GetMaxAroundI(maxbin, maxpos, maxval);
+    GetMaxAroundI(maxbin, maxpos, fHeight);
 
     // --- End NEW ---
@@ -391 +406 @@
         fTime      = maxpos;
         fTimeDev   = 0;
-        fSignal    = maxval;
+        fSignal    = fHeight;
         fSignalDev = 0;  // means: is valid
         return;
     }
 
-    // Search downwards for maxval/2
+    const Float_t h = fExtractionType==kIntegralAbs ? fHeightTm : fHeight*fHeightTm;
+
+    // Search downwards for fHeight/2
     // By doing also a search upwards we could extract the pulse width
-    const Double_t x1 = SearchY(maxpos, maxval/2);
-
-    fTime      = x1;
+    fTime      = SearchY(maxpos, h);
     fTimeDev   = 0;
+    if (width)
+    {
+        fWidth    = SearchYup(maxpos, h)-fTime;
+        fWidthDev = 0;
+    }
     fSignal    = CalcIntegral(maxpos);
     fSignalDev = 0;  // means: is valid