From 3142ebc3200e6e913d1b939c3bbf756941457d49 Mon Sep 17 00:00:00 2001 From: hristov Date: Fri, 19 May 2006 12:54:41 +0000 Subject: [PATCH] Adding detector ID to the track references --- STEER/AliModule.cxx | 6 +++--- STEER/AliModule.h | 2 +- STEER/AliTrackReference.cxx | 6 ++++-- STEER/AliTrackReference.h | 5 ++++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/STEER/AliModule.cxx b/STEER/AliModule.cxx index a7d8e78d179..4fd333f2223 100644 --- a/STEER/AliModule.cxx +++ b/STEER/AliModule.cxx @@ -803,16 +803,16 @@ void AliModule::SetTreeAddress() } //_____________________________________________________________________________ -void AliModule::AddTrackReference(Int_t label){ +AliTrackReference* AliModule::AddTrackReference(Int_t label){ // // add a trackrefernce to the list if (!fTrackReferences) { AliError("Container trackrefernce not active"); - return; + return 0; } Int_t nref = fTrackReferences->GetEntriesFast(); TClonesArray &lref = *fTrackReferences; - new(lref[nref]) AliTrackReference(label); + return new(lref[nref]) AliTrackReference(label); } diff --git a/STEER/AliModule.h b/STEER/AliModule.h index d77678f7294..2e902166be7 100644 --- a/STEER/AliModule.h +++ b/STEER/AliModule.h @@ -144,7 +144,7 @@ public: virtual void RemapTrackHitIDs(Int_t *) {} virtual void RemapTrackReferencesIDs(Int_t *map); //remaping track references MI virtual void ResetTrackReferences(); - virtual void AddTrackReference(Int_t label); + virtual AliTrackReference * AddTrackReference(Int_t label); virtual AliTrackReference * FirstTrackReference(Int_t track); virtual AliTrackReference * NextTrackReference(); virtual void MakeBranchTR(Option_t *opt=" "); diff --git a/STEER/AliTrackReference.cxx b/STEER/AliTrackReference.cxx index ba9d83a17c8..2e684ed2ae4 100644 --- a/STEER/AliTrackReference.cxx +++ b/STEER/AliTrackReference.cxx @@ -48,7 +48,8 @@ ClassImp(AliTrackReference) fPy(0), fPz(0), fLength(0), - fTime(0) + fTime(0), + fUserId(0) { // // Default constructor @@ -68,7 +69,8 @@ AliTrackReference::AliTrackReference(Int_t label) : fPy(0), fPz(0), fLength(gMC->TrackLength()), - fTime(gMC->TrackTime()) + fTime(gMC->TrackTime()), + fUserId(0) { // // Create Reference object out of label and diff --git a/STEER/AliTrackReference.h b/STEER/AliTrackReference.h index 3e4e2cb1245..87669d21df4 100644 --- a/STEER/AliTrackReference.h +++ b/STEER/AliTrackReference.h @@ -44,8 +44,10 @@ public: virtual Float_t Py() const {return fPy;} virtual Float_t Pz() const {return fPz;} virtual Float_t P() const {return TMath::Sqrt(fPx*fPx+fPy*fPy+fPz*fPz);} + virtual Int_t UserId() const {return fUserId;} virtual void SetPosition(Float_t x, Float_t y, Float_t z){fX=x; fY=y; fZ=z;} virtual void SetMomentum(Float_t px, Float_t py, Float_t pz){fPx=px; fPy=py; fPz=pz;} + virtual void SetUserId(Int_t userId){fUserId=userId;} // Methods to get position of the track reference in // in the TPC/TRD/TOF Tracking coordinate system @@ -67,7 +69,8 @@ protected: Float_t fPz; // momentum Float_t fLength; // track lenght from its origin in cm Float_t fTime; // time of flight in cm + Int_t fUserId; // optional Id defined by user - ClassDef(AliTrackReference,3) //Base class for all Alice track references + ClassDef(AliTrackReference,4) //Base class for all Alice track references }; #endif -- 2.39.3