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

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

diff --git a/STEER/AliESDHLTtrack.h b/STEER/AliESDHLTtrack.h
index 3694793489cf7d40198cfbeefe995e1f50e13481..fbbcc1298d7fc3e13f6b1bd3b5fe10749fa1d9de 100644 (file)
--- a/STEER/AliESDHLTtrack.h
+++ b/STEER/AliESDHLTtrack.h
@@ -7,6 +7,9 @@
 //   This is the class to handle HLT reconstruted TPC tracks
 //-------------------------------------------------------------------------
 #include "TObject.h"
+#include "TMath.h"
+
+class AliKalmanTrack;
 
 class AliESDHLTtrack : public TObject {
 public:
@@ -26,12 +29,12 @@ public:
   Int_t GetLastRow()  const {return fRowRange[1];}
   Int_t GetSector()   const {return fSector;}
 
-  Double_t GetFirstPointX() {return fFirstPoint[0];}
-  Double_t GetFirstPointY() {return fFirstPoint[1];}
-  Double_t GetFirstPointZ() {return fFirstPoint[2];}
-  Double_t GetLastPointX() {return fLastPoint[0];}
-  Double_t GetLastPointY() {return fLastPoint[1];}
-  Double_t GetLastPointZ() {return fLastPoint[2];}
+  Double_t GetFirstPointX() const {return fFirstPoint[0];}
+  Double_t GetFirstPointY() const {return fFirstPoint[1];}
+  Double_t GetFirstPointZ() const {return fFirstPoint[2];}
+  Double_t GetLastPointX() const {return fLastPoint[0];}
+  Double_t GetLastPointY() const {return fLastPoint[1];}
+  Double_t GetLastPointZ() const {return fLastPoint[2];}
 
   Int_t GetCharge() const {return fQ;}
   Double_t GetPt() const {return fPt;}
@@ -47,14 +50,14 @@ public:
   Float_t    GetSizeX()  const {return fSizeX;}
   Float_t    GetSizeY()  const {return fSizeY;}
 
-  Double_t GetPx() const {return fPt*cos(fPsi);}
-  Double_t GetPy() const {return fPt*sin(fPsi);}
+  Double_t GetPx() const {return fPt*TMath::Cos(fPsi);}
+  Double_t GetPy() const {return fPt*TMath::Sin(fPsi);}
   Double_t GetPz() const {return fPt*fTanl;}
 
   Double_t GetP() const;
   Double_t GetPseudoRapidity() const;
 
-  Float_t GetPID() {return fPID;}
+  Float_t GetPID() const {return fPID;}
 
   // setters
   void SetNHits(Int_t f) {fNHits = f;}
@@ -84,6 +87,8 @@ public:
 
   void SetPID(Float_t pid) {fPID = pid;}
 
+  Bool_t UpdateTrackParams(const AliKalmanTrack *t);
+
 protected:
   UShort_t fNHits;  // Number of assigned clusters
 
@@ -96,26 +101,26 @@ protected:
   Int_t fRowRange[2]; //Subsector where this track was build
   UShort_t fSector;      //Sector # where  this track was build
 
-  Float_t fFirstPoint[3]; //First and last track point in TPC
-  Float_t fLastPoint[3];
+  Float_t fFirstPoint[3]; //First track point in TPC
+  Float_t fLastPoint[3];  //Last track point in TPC
 
   Int_t    fQ;    //track charge
   Float_t fTanl; //tan of dipangle
   Float_t fPsi;  //azimuthal angle of the momentum 
   Float_t fPt;   //transverse momentum
 
-  Float_t fPterr;
-  Float_t fPsierr;
-  Float_t fTanlerr;
+  Float_t fPterr;   //Pt error
+  Float_t fPsierr;  //Psi error
+  Float_t fTanlerr; //Error of Tangent lambda
 
-  Float_t fBinX;
-  Float_t fBinY;
-  Float_t fSizeX;
-  Float_t fSizeY;
+  Float_t fBinX;  //X bin?
+  Float_t fBinY;  //Y bin?
+  Float_t fSizeX; //X size?
+  Float_t fSizeY; //Y size?
   
   Float_t fPID; //so far filled only for conformal mapper tracks
 
-  ClassDef(AliESDHLTtrack,2) //ESD HLT track class
+  ClassDef(AliESDHLTtrack,3) //ESD HLT track class
 };
 
 #endif