Changeset 8545 for trunk/MagicSoft/Mars/mextralgo/MExtralgoSpline.h

Timestamp:

06/11/07 16:49:41 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mextralgo/MExtralgoSpline.h

@@ -30 +30 @@
 
     Float_t fHeightTm;
-
-//    Float_t fResolution;
 
     // Result
@@ -117 +115 @@
     */
 
+    Int_t EvalDerivEq0(const Int_t i, Double_t &x1, Double_t &x2) const;
+/*
     inline void EvalDerivEq0(const Int_t i, Float_t &rc1, Float_t &rc2) const
     {
-        /* --- ORIGINAL CODE ---
+        // --- ORIGINAL CODE ---
         Double_t sumder = fDer2[i]+fDer2[i+1];
         Double_t difder = fDer2[i]-fDer2[i+1];
@@ -128 +128 @@
         Double_t denom = -3*(fDer2[i+1]-fDer2[i]);
 
-        rc1 = -(3*fDer2[i] + sqt3)/denom;
-        rc2 = -(3*fDer2[i] - sqt3)/denom;
-         */
-
+        rc1 = (3*fDer2[i] + sqt3)/denom;
+        rc2 = (3*fDer2[i] - sqt3)/denom;
+
+        // --- NEW CODE ---
         Double_t sumder = fDer2[i]+fDer2[i+1];
         Double_t difder = fDer2[i]-fDer2[i+1];
@@ -139 +139 @@
         Double_t sqt3  = sqt1+sqt2<0 ? 0 : sqrt((sqt1 + sqt2)/3);
 
-        rc1 = -(fDer2[i] + sqt3)/difder;
-        rc2 = -(fDer2[i] - sqt3)/difder;
-    }
+        rc1 = (fDer2[i] + sqt3)/difder;
+        rc2 = (fDer2[i] - sqt3)/difder;
+    }*/
 
     // Calculate the "Stammfunktion" of the Eval-function
@@ -355 +355 @@
         // Find analytical maximum in the bin i in the interval [min,max[
 
-        Float_t x1, x2;
-        EvalDerivEq0(i, x1, x2);
+        Double_t x1, x2;
+        if (!EvalDerivEq0(i, x1, x2))
+            return kFALSE;
+
         // const Float_t x1 = EvalDerivEq0S1(i);
         // const Float_t x2 = EvalDerivEq0S2(i);
@@ -479 +481 @@
     void SetExtractionType(ExtractionType_t typ)     { fExtractionType = typ; }
     void SetHeightTm(Float_t h)                      { fHeightTm = h; }
-        //    void SetResolution(Float_t res)                  { fResolution=res; }
 
     Float_t GetTime() const      { return fTime; }