Changeset 3210 for trunk

Timestamp:

02/17/04 09:19:15 (21 years ago)

Author:

raducci

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/spline.C (modified) (1 diff)
• mtools/MCubicSpline.cc (modified) (7 diffs)
• mtools/MCubicSpline.h (modified) (1 diff)

trunk/MagicSoft/Mars/macros/spline.C

@@ -23 +23 @@
 
 /* User Change */
-Byte_t y[]={0x0F,0x10,0x2F,0x7F,0xAA,0x6C,0x14,0x13,0x15,0x18,0x21,0x12,0x11,0x14,0x13};
+const Byte_t y[]={0x0F,0x10,0x2F,0x7F,0xAA,0x6C,0x14,0x13,0x15,0x18,0x21,0x12,0x11,0x14,0x13};
 /* End user Change */
-Byte_t x[]={0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E};
+const Byte_t x[]={0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E};
 
 /*This cast is needed only to show graphically the output. Don' t needed if you

trunk/MagicSoft/Mars/mtools/MCubicSpline.cc

@@ -46 +46 @@
 //
 //
-MCubicSpline::MCubicSpline(Byte_t *y, Byte_t *x, Bool_t areAllEq,
+MCubicSpline::MCubicSpline(const Byte_t *y, const Byte_t *x, Bool_t areAllEq,
                            Int_t n, Double_t begSD, Double_t endSD)
 {
@@ -57 +57 @@
 //
 //
-MCubicSpline::MCubicSpline(Byte_t *y)
-{
-    Byte_t x[]={0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E};
+MCubicSpline::MCubicSpline(const Byte_t *y)
+{
+    const Byte_t x[]={0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E};
     Init(y,x,kTRUE,15,0.0,0.0);
 }
@@ -68 +68 @@
 //
 //
-void MCubicSpline::Init(Byte_t *y, Byte_t *x, Bool_t areAllEq,
+void MCubicSpline::Init(const Byte_t *y, const Byte_t *x, Bool_t areAllEq,
                            Int_t n, Double_t begSD, Double_t endSD)
 
@@ -137 +137 @@
 Double_t MCubicSpline :: Eval(Double_t x)
 {
-    const Int_t n = fCoeff->GetSize()-1;
+    const Int_t n = fCoeff->GetSize();
     for (Int_t i = 0; i < n; i++)
     {
@@ -177 +177 @@
     MCubicCoeff *c;
     while ((c=(MCubicCoeff*)Next()))
-        min = TMath::Min(min, c->GetMax());
+        min = TMath::Min(min, c->GetMin());
 
     return min;
@@ -223 +223 @@
     while ((c=(MCubicCoeff*)Next()))
     {
-        const Double_t temp = c->GetMax();
+        const Double_t temp = c->GetMin();
         if (temp >= min)
             continue;
@@ -231 +231 @@
     }
 
-    return cmin ? cmin->GetAbMax() : FLT_MAX;
+    return cmin ? cmin->GetAbMin() : FLT_MAX;
 }
 

trunk/MagicSoft/Mars/mtools/MCubicSpline.h

@@ -17 +17 @@
     TObjArray *fCoeff; //array of the coefficients
 
-    void Init(Byte_t *y, Byte_t *x, Bool_t areAllEq, Int_t n, Double_t begSD, Double_t endSD);
+    void Init(const Byte_t *y, const Byte_t *x, Bool_t areAllEq, Int_t n, Double_t begSD, Double_t endSD);
 
  public:
-    MCubicSpline(Byte_t *y, Byte_t *x, Bool_t areAllEq, Int_t n, Double_t begSD=0.0, Double_t endSD=0.0);
-    MCubicSpline(Byte_t *y);
+    MCubicSpline(const Byte_t *y, const Byte_t *x, Bool_t areAllEq, Int_t n, Double_t begSD=0.0, Double_t endSD=0.0);
+    MCubicSpline(const Byte_t *y);
     ~MCubicSpline();
     Double_t Eval(Double_t x); //Eval the spline at a point x