bug #93685: changes in AliAODTrack/ALiAODEvent - commit to trunk

diff --git a/STEER/AOD/AliAODEvent.h b/STEER/AOD/AliAODEvent.h
index faf0cacc15a589099489e21c9dc174df034c3ea5..63b5089370a305c00f7bf8f5ff4c948ca3b251e2 100644 (file)
--- a/STEER/AOD/AliAODEvent.h
+++ b/STEER/AOD/AliAODEvent.h
@@ -139,7 +139,7 @@ class AliAODEvent : public AliVEvent {
   TClonesArray *GetTracks()              const { return fTracks; }
   Int_t         GetNTracks()             const { return fTracks? fTracks->GetEntriesFast() : 0; }
   Int_t         GetNumberOfTracks()      const { return GetNTracks(); }
-  AliAODTrack  *GetTrack(Int_t nTrack)   const { return fTracks ? (AliAODTrack*)fTracks->UncheckedAt(nTrack):0; }
+  AliAODTrack  *GetTrack(Int_t nTrack)   const { if(fTracks && fTracks->UncheckedAt(nTrack)) ((AliAODTrack*)fTracks->UncheckedAt(nTrack))->SetAODEvent(this);return fTracks ? (AliAODTrack*)fTracks->UncheckedAt(nTrack):0; }
   Int_t         AddTrack(const AliAODTrack* trk)
     {new((*fTracks)[fTracks->GetEntriesFast()]) AliAODTrack(*trk); return fTracks->GetEntriesFast()-1;}
   Int_t         GetMuonTracks(TRefArray *muonTracks) const;

diff --git a/STEER/AOD/AliAODTrack.cxx b/STEER/AOD/AliAODTrack.cxx
index fea3dcbbd83d6932abdffb1ee63ab7d680d946a7..cbd5c2f5c31e048cd29a754aa4c1018b889e3e63 100644 (file)
--- a/STEER/AOD/AliAODTrack.cxx
+++ b/STEER/AOD/AliAODTrack.cxx
@@ -26,6 +26,7 @@
 #include "AliExternalTrackParam.h"
 #include "AliVVertex.h"
 #include "AliAODTrack.h"
+#include "AliAODEvent.h"
 
 ClassImp(AliAODTrack)
 
@@ -53,7 +54,8 @@ AliAODTrack::AliAODTrack() :
   fDetPid(NULL),
   fProdVertex(NULL),
   fTrackPhiOnEMCal(-999),
-  fTrackEtaOnEMCal(-999)
+  fTrackEtaOnEMCal(-999),
+  fAODEvent(NULL)
 {
   // default constructor
 
@@ -103,7 +105,8 @@ AliAODTrack::AliAODTrack(Short_t id,
   fDetPid(NULL),
   fProdVertex(prodVertex),
   fTrackPhiOnEMCal(-999),
-  fTrackEtaOnEMCal(-999)
+  fTrackEtaOnEMCal(-999),
+  fAODEvent(NULL)
 {
   // constructor
  
@@ -157,7 +160,8 @@ AliAODTrack::AliAODTrack(Short_t id,
   fDetPid(NULL),
   fProdVertex(prodVertex),
   fTrackPhiOnEMCal(-999),
-  fTrackEtaOnEMCal(-999)
+  fTrackEtaOnEMCal(-999),
+  fAODEvent(NULL)
 {
   // constructor
  
@@ -205,7 +209,8 @@ AliAODTrack::AliAODTrack(const AliAODTrack& trk) :
   fDetPid(NULL),
   fProdVertex(trk.fProdVertex),
   fTrackPhiOnEMCal(trk.fTrackPhiOnEMCal),
-  fTrackEtaOnEMCal(trk.fTrackEtaOnEMCal)
+  fTrackEtaOnEMCal(trk.fTrackEtaOnEMCal),
+  fAODEvent(trk.fAODEvent)
 {
   // Copy constructor
 

diff --git a/STEER/AOD/AliAODTrack.h b/STEER/AOD/AliAODTrack.h
index 8e0b2e6568502f9e44cef2cabf37db80a0d2023e..4aef0fe69eb9f5f9195135b3260231cd6bb7d60e 100644 (file)
--- a/STEER/AOD/AliAODTrack.h
+++ b/STEER/AOD/AliAODTrack.h
@@ -21,6 +21,7 @@
 
 class AliVVertex;
 class AliTPCdEdxInfo;
+class AliAODEvent;
 
 class AliAODTrack : public AliVTrack {
 
@@ -283,7 +284,9 @@ class AliAODTrack : public AliVTrack {
   UChar_t   GetTRDntrackletsPID() const;
   void      GetHMPIDpid(Double_t *p) const { if (fDetPid) fDetPid->GetHMPIDprobs(p); }
 
-  
+  const AliAODEvent* GetAODEvent(){return fAODEvent;}
+  void SetAODEvent(const AliAODEvent* ptr){fAODEvent = ptr;}
+
   AliAODPid    *GetDetPid() const { return fDetPid; }
   AliAODVertex *GetProdVertex() const { return (AliAODVertex*)fProdVertex.GetObject(); }
   
@@ -408,7 +411,9 @@ class AliAODTrack : public AliVTrack {
   Double_t      fTrackPhiOnEMCal;   // phi of track after being propagated to 430cm
   Double_t      fTrackEtaOnEMCal;   // eta of track after being propagated to 430cm
 
-  ClassDef(AliAODTrack, 16);
+  const AliAODEvent* fAODEvent;     //! 
+
+  ClassDef(AliAODTrack, 17);
 };
 
 inline Bool_t  AliAODTrack::IsPrimaryCandidate() const