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

Timestamp:

01/06/09 13:07:00 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mextralgo/MExtralgoSpline.cc

@@ -18 +18 @@
 !   Author(s): Markus Gaug 09/2004 <mailto:markus@ifae.es>
 !
-!   Copyright: MAGIC Software Development, 2002-2007
+!   Copyright: MAGIC Software Development, 2002-2008
 !
 !
@@ -47 +47 @@
 //   (Note that the variables fDer are not real first derivative coefficients.)
 //
+//   Note, this spline is not optimized to be evaluated many many times, but
+//   it is optimized to be initialized very fast with new values again and
+//   again.
+//
 //////////////////////////////////////////////////////////////////////////////
 #include "MExtralgoSpline.h"
@@ -179 +183 @@
 // at x, until x==0. If y is not found -2 is returned.
 //
-Double_t MExtralgoSpline::SearchY(Float_t x, Float_t y) const
+Double_t MExtralgoSpline::SearchYdn(Float_t x, Float_t y) const
 {
     if (x>=fNum-1)
@@ -185 +189 @@
 
     Int_t i = TMath::FloorNint(x);
+    if (i<0)
+        return -2;
+
     Double_t rc = FindY(i, kTRUE, y, 0, x-i);
     while (--i>=0 && rc<0)
@@ -198 +205 @@
 
     Int_t i = TMath::FloorNint(x);
+    if (i>fNum-2)
+        return -2;
+
     Double_t rc = FindY(i, kFALSE, y, x-i, 1.);
-    while (i++<fNum-1 && rc<0)
+    while (++i<fNum-1 && rc<0)
         rc = FindY(i, kFALSE, y);
 
@@ -287 +297 @@
     // Search downwards for fHeight/2
     // By doing also a search upwards we could extract the pulse width
-    fTime      = SearchY(maxpos, h);
+    fTime      = SearchYdn(maxpos, h);
     fTimeDev   = 0;
     if (width)