Moved a methof from private to public

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

diff --git a/STEER/AliAODTrack.h b/STEER/AliAODTrack.h
index 6b62eaefdf559a932eb4baa054fc22248736d702..704e12cc4cfa666ef03b1b51fd46730d518c0d76 100644 (file)
--- a/STEER/AliAODTrack.h
+++ b/STEER/AliAODTrack.h
@@ -61,7 +61,8 @@ class AliAODTrack : public AliVParticle {
              Bool_t usedForVtxFit,
              Bool_t usedForPrimVtxFit,
              AODTrk_t ttype=kUndef,
-             UInt_t selectInfo=0);
+             UInt_t selectInfo=0,
+             Float_t chi2perNDF = -999.);
 
   AliAODTrack(Short_t id,
              Int_t label,
@@ -77,7 +78,8 @@ class AliAODTrack : public AliVParticle {
              Bool_t usedForVtxFit,
              Bool_t usedForPrimVtxFit,
              AODTrk_t ttype=kUndef,
-             UInt_t selectInfo=0);
+             UInt_t selectInfo=0,
+             Float_t chi2perNDF = -999.);
 
   virtual ~AliAODTrack();
   AliAODTrack(const AliAODTrack& trk); 
@@ -119,6 +121,7 @@ class AliAODTrack : public AliVParticle {
   virtual const Double_t *PID() const { return fPID; }
   AODTrkPID_t GetMostProbablePID() const;
   void ConvertAliPIDtoAODPID();
+  void SetDetPID(AliAODPid *aodpid) {fDetPid = aodpid;}
 
   template <class T> void GetPID(T *pid) const {
     for(Int_t i=0; i<10; ++i) pid[i]=fPID[i];}
@@ -134,6 +137,7 @@ class AliAODTrack : public AliVParticle {
   Short_t GetID() const { return fID; }
   Int_t   GetLabel() const { return fLabel; } 
   Char_t  GetType() const { return fType;}
+  Bool_t  IsPrimaryCandidate() const;
   Bool_t  GetUsedForVtxFit() const { return TestBit(kUsedForVtxFit); }
   Bool_t  GetUsedForPrimVtxFit() const { return TestBit(kUsedForPrimVtxFit); }
 
@@ -157,9 +161,30 @@ class AliAODTrack : public AliVParticle {
 
   void RemoveCovMatrix() {delete fCovMatrix; fCovMatrix=NULL;}
 
-  UChar_t GetITSClusterMap() const     { return (UChar_t)fITSMuonClusterMap; }
-  UInt_t  GetMUONClusterMap() const    { return fITSMuonClusterMap/65536; }
-  UInt_t  GetITSMUONClusterMap() const { return fITSMuonClusterMap; }
+  Double_t XAtDCA() const { return fPositionAtDCA[0]; }
+  Double_t YAtDCA() const { return fPositionAtDCA[1]; }
+  Double_t ZAtDCA() const {
+    if (IsMuonTrack()) return fPosition[2];
+    else if (TestBit(kIsDCA)) return fPosition[1];
+    else return -999.; }
+  Bool_t   XYZAtDCA(Double_t x[3]) const { x[0] = XAtDCA(); x[1] = YAtDCA(); x[2] = ZAtDCA(); return kTRUE; }
+  
+  Double_t DCA() const {
+    if (IsMuonTrack()) return TMath::Sqrt(XAtDCA()*XAtDCA() + YAtDCA()*YAtDCA());
+    else if (TestBit(kIsDCA)) return fPosition[0];
+    else return -999.; }
+  
+  Double_t PxAtDCA() const { return fMomentumAtDCA[0]; }
+  Double_t PyAtDCA() const { return fMomentumAtDCA[1]; }
+  Double_t PzAtDCA() const { return fMomentumAtDCA[2]; }
+  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; }
+  
+  UChar_t  GetITSClusterMap() const       { return (UChar_t)(fITSMuonClusterMap&0xff); }
+  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);}
 
   AliAODPid    *GetDetPid() const { return fDetPid; }
@@ -188,12 +213,16 @@ class AliAODTrack : public AliVParticle {
   template <class T> void SetP(const T *p, Bool_t cartesian = kTRUE);
   void SetP() {fMomentum[0]=fMomentum[1]=fMomentum[2]=-999.;}
 
+  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 SetCharge(Short_t q) { fCharge = q; }
   void SetChi2perNDF(Double_t chi2perNDF) { fChi2perNDF = chi2perNDF; }
 
-  void SetITSClusterMap(UChar_t itsClusMap)        { fITSMuonClusterMap = (UInt_t)itsClusMap; }
-  void SetMuonClusterMap(UInt_t muonClusMap)       { fITSMuonClusterMap = muonClusMap*65536; }
-  void SetITSMuonClusterMap(UInt_t itsMuonClusMap) { fITSMuonClusterMap = itsMuonClusMap; }
+  void SetITSClusterMap(UChar_t itsClusMap)                 { fITSMuonClusterMap = (fITSMuonClusterMap&0xffffff00)|(((UInt_t)itsClusMap)&0xff); }
+  void SetHitsPatternInTrigCh(UShort_t hitsPatternInTrigCh) { fITSMuonClusterMap = (fITSMuonClusterMap&0xffff00ff)|((((UInt_t)hitsPatternInTrigCh)&0xff)<<8); }
+  void SetMuonClusterMap(UInt_t muonClusMap)                { fITSMuonClusterMap = (fITSMuonClusterMap&0xfc00ffff)|((muonClusMap&0x3ff)<<16); }
+  void SetITSMuonClusterMap(UInt_t itsMuonClusMap)          { fITSMuonClusterMap = itsMuonClusMap; }
 
   Int_t GetMatchTrigger() const {return fITSMuonClusterMap>>30;}
                                        //  0 Muon track does not match trigger
@@ -206,12 +235,10 @@ class AliAODTrack : public AliVParticle {
   Int_t    MatchTriggerLowPt()   const  { return (GetMatchTrigger()>1)?1:0; }  //  Muon track matches trigger track and passes Low pt cut
   Int_t    MatchTriggerHighPt()  const  { return (GetMatchTrigger()>2)?1:0; }  //  Muon track matches trigger track and passes High pt cut
   Double_t GetChi2MatchTrigger() const  { return fChi2MatchTrigger;}
-  void     SetChi2MatchTrigger(Double_t Chi2MatchTrigger) {fChi2MatchTrigger = Chi2MatchTrigger;}
-  UShort_t GetHitsPatternInTrigCh() const { return (fITSMuonClusterMap&0xff00)>>8; }
-  void     SetHitsPatternInTrigCh(UShort_t hitsPatternInTrigCh);
+  void     SetChi2MatchTrigger(Double_t Chi2MatchTrigger) {fChi2MatchTrigger = Chi2MatchTrigger; }
   Int_t    HitsMT(Int_t istation, Int_t iplane, Char_t *cathode=0);  // Check if track hits Muon chambers
   Int_t    HitsMuonChamber(Int_t MuonChamber);  // Check if track hits Muon chambers
-  Bool_t   IsMuonTrack() const { return fITSMuonClusterMap>>16;}  // This scheme has to be checked, still!
+  Bool_t   IsMuonTrack() const { return (GetMUONClusterMap()>0) ? kTRUE : kFALSE; }
 
   void     SetProdVertex(TObject *vertex) { fProdVertex = vertex; }
   void     SetType(AODTrk_t ttype) { fType=ttype; }
@@ -225,15 +252,19 @@ class AliAODTrack : public AliVParticle {
   // Momentum & position
   Double32_t    fMomentum[3];       // momemtum stored in pt, phi, theta
   Double32_t    fPosition[3];       // position of first point on track or dca
-
-  Double32_t    fChi2perNDF;        // chi2/NDF of mometum fit
+  
+  Double32_t    fMomentumAtDCA[3];  // momentum (px,py,pz) at DCA
+  Double32_t    fPositionAtDCA[2];  // trasverse position (x,y) at DCA
+  
+  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
 
   ULong_t       fFlags;             // reconstruction status flags 
   Int_t         fLabel;             // track label, points back to MC track
   
-  UInt_t        fITSMuonClusterMap; // map of ITS and muon clusters, one bit per layer (ITS: bit 1-8, muon: bit 17-32) 
+  UInt_t        fITSMuonClusterMap; // map of ITS and muon clusters, one bit per layer
+                                    // (ITS: bit 1-8, muon trigger: bit 9-16, muon tracker: bit 17-26, muon match trigger: bit 31-32) 
   UInt_t        fFilterMap;         // filter information, one bit per set of cuts
 
   Short_t       fID;                // unique track ID, points back to the ESD track
@@ -245,7 +276,18 @@ class AliAODTrack : public AliVParticle {
   AliAODPid    *fDetPid;            // more detailed or detector specific pid information
   TRef          fProdVertex;        // vertex of origin
 
-  ClassDef(AliAODTrack,7);
+  ClassDef(AliAODTrack,8);
 };
 
+inline Bool_t  AliAODTrack::IsPrimaryCandidate() const
+{
+    // True of track passes primary particle selection (independent of type) 
+    // 
+    if (fFilterMap) {
+       return kTRUE;
+    } else {
+       return kFALSE;
+    }
+}
+
 #endif