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

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

diff --git a/STEER/AliAODTrack.h b/STEER/AliAODTrack.h
index 6abb656e9d64d7cb4c49e00efa29c04f0b07ec90..b9f483e8e34e69dc8db873c8a34d9417ca716778 100644 (file)
--- a/STEER/AliAODTrack.h
+++ b/STEER/AliAODTrack.h
@@ -17,6 +17,9 @@
 #include "AliAODVertex.h"
 #include "AliAODRedCov.h"
 #include "AliAODPid.h"
+ 
+
+class AliVVertex;
 
 class AliAODTrack : public AliVTrack {
 
@@ -103,7 +106,8 @@ class AliAODTrack : public AliVTrack {
   virtual Double_t Zv() const { return GetProdVertex() ? GetProdVertex()->GetZ() : -999.; }
   virtual Bool_t   XvYvZv(Double_t x[3]) const { x[0] = Xv(); x[1] = Yv(); x[2] = Zv(); return kTRUE; }
 
-  Double_t Chi2perNDF() const { return fChi2perNDF; }
+  Double_t Chi2perNDF()  const { return fChi2perNDF; }
+  UShort_t GetTPCNcls()  const { return fTPCClusterMap.CountBits();}
   
   virtual Double_t M() const { return M(GetMostProbablePID()); }
   Double_t M(AODTrkPID_t pid) const;
@@ -118,6 +122,9 @@ class AliAODTrack : public AliVTrack {
 
   virtual Short_t  Charge() const {return fCharge; }
 
+  virtual Bool_t   PropagateToDCA(const AliVVertex *vtx, 
+         Double_t b, Double_t maxd, Double_t dz[2], Double_t covar[3]);
+
   // PID
   virtual const Double_t *PID() const { return fPID; }
   AODTrkPID_t GetMostProbablePID() const;
@@ -145,8 +152,9 @@ class AliAODTrack : public AliVTrack {
   template <class T> void GetP(T *p) const {
     p[0]=fMomentum[0]; p[1]=fMomentum[1]; p[2]=fMomentum[2];}
 
-  template <class T> void GetPxPyPz(T *p) const {
-    p[0] = Px(); p[1] = Py(); p[2] = Pz();}
+//  template <class T> void GetPxPyPz(T *p) const {
+//    p[0] = Px(); p[1] = Py(); p[2] = Pz();}
+  Bool_t GetPxPyPz(Double_t *p) const;
 
   template <class T> Bool_t GetPosition(T *x) const {
     x[0]=fPosition[0]; x[1]=fPosition[1]; x[2]=fPosition[2];
@@ -187,13 +195,19 @@ class AliAODTrack : public AliVTrack {
   Double_t PAtDCA() const { return TMath::Sqrt(PxAtDCA()*PxAtDCA() + PyAtDCA()*PyAtDCA() + PzAtDCA()*PzAtDCA()); }
   Bool_t   PxPyPzAtDCA(Double_t p[3]) const { p[0] = PxAtDCA(); p[1] = PyAtDCA(); p[2] = PzAtDCA(); return kTRUE; }
   
+  Double_t GetRAtAbsorberEnd() const { return fRAtAbsorberEnd; }
+  
   UChar_t  GetITSClusterMap() const       { return (UChar_t)(fITSMuonClusterMap&0xff); }
+  Int_t    GetITSNcls() const; 
+  Bool_t   HasPointOnITSLayer(Int_t i) const { return TESTBIT(GetITSClusterMap(),i); }
   UShort_t GetHitsPatternInTrigCh() const { return (UShort_t)((fITSMuonClusterMap&0xff00)>>8); }
   UInt_t   GetMUONClusterMap() const      { return (fITSMuonClusterMap&0x3ff0000)>>16; }
   UInt_t   GetITSMUONClusterMap() const   { return fITSMuonClusterMap; }
   
   Bool_t  TestFilterBit(UInt_t filterBit) const {return (Bool_t) ((filterBit & fFilterMap) != 0);}
   Bool_t  TestFilterMask(UInt_t filterMask) const {return (Bool_t) ((filterMask & fFilterMap) == filterMask);}
+  void    SetFilterMap(UInt_t i){fFilterMap = i;}
+  UInt_t  GetFilterMap(){return fFilterMap;}
 
   const TBits& GetTPCClusterMap() const {return fTPCClusterMap;}
   const TBits& GetTPCSharedMap() const {return fTPCSharedMap;}
@@ -229,6 +243,8 @@ class AliAODTrack : public AliVTrack {
   void SetXYAtDCA(Double_t x, Double_t y) {fPositionAtDCA[0] = x; fPositionAtDCA[1] = y;}
   void SetPxPyPzAtDCA(Double_t pX, Double_t pY, Double_t pZ) {fMomentumAtDCA[0] = pX; fMomentumAtDCA[1] = pY; fMomentumAtDCA[2] = pZ;}
   
+  void SetRAtAbsorberEnd(Double_t r) { fRAtAbsorberEnd = r; }
+  
   void SetCharge(Short_t q) { fCharge = q; }
   void SetChi2perNDF(Double_t chi2perNDF) { fChi2perNDF = chi2perNDF; }
 
@@ -258,6 +274,8 @@ class AliAODTrack : public AliVTrack {
   void     SetProdVertex(TObject *vertex) { fProdVertex = vertex; }
   void     SetType(AODTrk_t ttype) { fType=ttype; }
 
+
+
   // Dummy
   Int_t    PdgCode() const {return 0;}
   
@@ -270,6 +288,8 @@ class AliAODTrack : public AliVTrack {
   Double32_t    fMomentumAtDCA[3];  // momentum (px,py,pz) at DCA
   Double32_t    fPositionAtDCA[2];  // trasverse position (x,y) at DCA
   
+  Double32_t    fRAtAbsorberEnd;    // transverse position r at the end of the muon absorber
+  
   Double32_t    fChi2perNDF;        // chi2/NDF of momentum fit
   Double32_t    fChi2MatchTrigger;  // chi2 of trigger/track matching
   Double32_t    fPID[10];           // [0.,1.,8] pointer to PID object
@@ -293,7 +313,7 @@ class AliAODTrack : public AliVTrack {
   AliAODPid    *fDetPid;            // more detailed or detector specific pid information
   TRef          fProdVertex;        // vertex of origin
 
-  ClassDef(AliAODTrack, 9);
+  ClassDef(AliAODTrack, 11);
 };
 
 inline Bool_t  AliAODTrack::IsPrimaryCandidate() const
@@ -307,4 +327,12 @@ inline Bool_t  AliAODTrack::IsPrimaryCandidate() const
     }
 }
 
+inline Int_t AliAODTrack::GetITSNcls() const 
+{
+  // Number of points in ITS
+  Int_t n=0;
+  for(Int_t i=0;i<6;i++) if(HasPointOnITSLayer(i)) n++;
+  return n;
+}
+
 #endif