Fix of a bug that arises when adding more than 1 function to AliRsnPairFunctions

[u/mrichter/AliRoot.git] / STEER / AliRieman.h

diff --git a/STEER/AliRieman.h b/STEER/AliRieman.h
index 59026d57f829edd3f08a4fd6f5c392fd9e9f3f97..651ee82f2c23c6852ed0d029611ddfb063341bfb 100644 (file)
--- a/STEER/AliRieman.h
+++ b/STEER/AliRieman.h
@@ -22,11 +22,11 @@ class AliRieman : public TObject{
   void AddPoint(Double_t x, Double_t y, Double_t z, Double_t sy, Double_t sz);
   Int_t GetN() const {return fN;}
   Int_t GetCapacity() const {return fCapacity;}
-  Double_t * GetX(){return fX;}
-  Double_t * GetY(){return fY;}
-  Double_t * GetZ(){return fZ;}
-  Double_t * GetSy(){return fSy;}
-  Double_t * GetSz(){return fSz;}
+  Double_t * GetX()  const {return fX;}
+  Double_t * GetY()  const {return fY;}
+  Double_t * GetZ()  const {return fZ;}
+  Double_t * GetSy() const {return fSy;}
+  Double_t * GetSz() const {return fSz;}
   void Update();
   void UpdatePol();
   Double_t*  GetParam(){return fParams;}
@@ -36,17 +36,22 @@ class AliRieman : public TObject{
   Double_t GetZat(Double_t x) const; 
   Double_t GetDYat(Double_t x) const;
   Double_t GetDZat(Double_t x) const;
+  Bool_t   GetXYZat(Double_t r, Double_t alpha, Float_t *xyz) const;
   //
+  Bool_t   IsValid(){ return fConv;}
   Double_t GetChi2Y() const { return fChi2Y;}
   Double_t GetChi2Z() const { return fChi2Z;}
   Double_t GetChi2() const  { return fChi2; }
-
   Double_t CalcChi2Y() const;  
   Double_t CalcChi2Z() const;
   Double_t CalcChi2() const;
   AliRieman * MakeResiduals() const;
+  Double_t    GetErrY(Double_t x) const; 
+  Double_t    GetErrZ(Double_t x) const;
+  Bool_t GetExternalParameters(Double_t xref, Double_t *params, Double_t * covar);
   //
  protected:
+  void          UpdateCovariancePol();  // update covariance for error estimates
   // public:
   Int_t         fCapacity;  // capacity
   Int_t         fN;         // numebr of points
@@ -57,16 +62,21 @@ class AliRieman : public TObject{
   Double_t      *fSz;        //[fN] sigma z coordinate
   Double_t      fParams[6]; //Parameters
   TMatrixDSym  *fCovar;     //Covariance
+  TMatrixDSym  *fCovarPolY; // covariance matrix for parabola fit in xy - used for error estimation
+  TMatrixDSym  *fCovarPolZ; // covariance matrix for parabola fit in xy - used for error estimation
   Double_t      fSumXY[9];  //sums for XY part
   Double_t      fSumXZ[9];  //sums for XZ part
+  Double_t      fSumPolY[5]; //sums of polynoms X with weight Z
+  Double_t      fSumPolZ[5]; //sums of polynoms X with weight Z
+  Double_t      fSumZZ;     //sums of Z2 
   Double_t      fChi2;      //sums of chi2
   Double_t      fChi2Y;     //sums of chi2 for y coord
   Double_t      fChi2Z;     //sums of chi2 foz z coord 
   Bool_t        fConv;      // indicates convergation
  protected:  
  private:
-  AliRieman& operator=(const AliRieman &rieman){return *this;}
-  ClassDef(AliRieman,1)  // Fast fit of helices on ITS RecPoints
+  AliRieman& operator=(const AliRieman &rieman);
+  ClassDef(AliRieman,2)  // Fast fit of helices on ITS RecPoints
 };