Obsolete TrackReferences related code removed.

diff --git a/STEER/AliModule.cxx b/STEER/AliModule.cxx
index fc3a2545df164fbf578b8c8be232231960db678b..516192943dc20b79fee39a9087a4af9879fd7c1f 100644 (file)
--- a/STEER/AliModule.cxx
+++ b/STEER/AliModule.cxx
@@ -71,7 +71,6 @@ AliModule::AliModule():
   fHistograms(0),
   fNodes(0),
   fEnable(1),
-  fTrackReferences(0),
   fMaxIterTrackRef(0),
   fCurrentIterTrackRef(0),
   fRunLoader(0)
@@ -94,7 +93,6 @@ AliModule::AliModule(const char* name,const char *title):
   fHistograms(new TList()),
   fNodes(new TList()),
   fEnable(1),
-  fTrackReferences(new TClonesArray("AliTrackReference", 100)),
   fMaxIterTrackRef(0),
   fCurrentIterTrackRef(0),
   fRunLoader(0)
@@ -148,12 +146,6 @@ AliModule::~AliModule()
     delete fHistograms;
     fHistograms = 0;
   }
-  // Delete track references
-  if (fTrackReferences) {
-    fTrackReferences->Delete();
-    delete fTrackReferences;
-    fTrackReferences     = 0;
-  }
   // Delete TArray objects
   delete fIdtmed;
   delete fIdmate;
@@ -681,50 +673,6 @@ AliTrackReference*  AliModule::AddTrackReference(Int_t label, Int_t id){
     return (gAlice->GetMCApp()->AddTrackReference(label, id));
 }
 
- //_______________________________________________________________________
-AliTrackReference* AliModule::FirstTrackReference(Int_t track)
-{
-    //
-    // Initialise the hit iterator
-    // Return the address of the first hit for track
-    // If track>=0 the track is read from disk
-    // while if track0 the first hit of the current
-    // track is returned
-    //
-    if(track>=0)
-    {
-       if (fRunLoader == 0x0)
-           AliFatal("AliRunLoader not initialized. Can not proceed");
-       fRunLoader->GetAliRun()->GetMCApp()->ResetTrackReferences();
-       fRunLoader->TreeTR()->GetEvent(track);
-    }
-    //
-    fMaxIterTrackRef     = fTrackReferences->GetEntriesFast();
-    fCurrentIterTrackRef = 0;
-    if(fMaxIterTrackRef) return dynamic_cast<AliTrackReference*>(fTrackReferences->UncheckedAt(0));
-    else            return 0;
-}
-
- //_______________________________________________________________________
-AliTrackReference* AliModule::NextTrackReference()
-{
-    //
-    // Return the next hit for the current track
-    //
-    if(fMaxIterTrackRef) {
-       if(++fCurrentIterTrackRef < fMaxIterTrackRef)
-           return dynamic_cast<AliTrackReference*>(fTrackReferences->UncheckedAt(fCurrentIterTrackRef));
-       else
-           return 0;
-    } else {
-       AliWarning("Iterator called without calling FistTrackReference before");
-       return 0;
-    }
-}
-
-
-
-
 //_____________________________________________________________________________
 TTree* AliModule::TreeTR()
 {

diff --git a/STEER/AliModule.h b/STEER/AliModule.h
index bb2658e6375b9c2769c960e739b8d3ca55ea5fdb..dc05ef3242b25bab40a5c25af9adbc24be7b9a57 100644 (file)
--- a/STEER/AliModule.h
+++ b/STEER/AliModule.h
@@ -14,11 +14,11 @@
 
 #include <Riostream.h>
 #include <TNamed.h>
+#include <TClonesArray.h>
 
 #include "AliLog.h"
 #include "AliTriggerDetector.h"
 
-class TClonesArray;
 class TBrowser;
 class TArrayI;
 class TFile;
@@ -43,8 +43,8 @@ public:
   virtual ~AliModule();
 
   // Inline functions
-  virtual  int           GetNdigits() const {return 0;}
-  virtual  int           GetNhits()  const {return 0;}
+  virtual  Int_t         GetNdigits() const {return 0;}
+  virtual  Int_t         GetNhits()  const {return 0;}
   virtual  TArrayI      *GetIdtmed()   const {return fIdtmed;}
   virtual  TList        *Histograms() const {return fHistograms;}
   virtual  TList        *Nodes()  const {return fNodes;}
@@ -141,12 +141,8 @@ public:
   virtual void        ReadEuclid(const char *filnam, char *topvol);
   virtual void        ReadEuclidMedia(const char *filnam);
 // Track reference related
-  TClonesArray *TrackReferences()   const {return fTrackReferences;}
   virtual  AliTrackReference * AddTrackReference(Int_t label, Int_t id = -999);
-  virtual  AliTrackReference * FirstTrackReference(Int_t track);
-  virtual  AliTrackReference * NextTrackReference();
   TTree* TreeTR();  //shorcut method for accessing treeTR from folder
-
   void                SetRunLoader(AliRunLoader* runLoader) 
     {fRunLoader = runLoader;}
   
@@ -172,7 +168,6 @@ protected:
   TList        *fHistograms;  //List of histograms
   TList        *fNodes;       //List of geometry nodes
   Bool_t        fEnable;      //StepManager enabling flag
-  TClonesArray *fTrackReferences;     //!list of track references - for one primary track only -MI
   Int_t         fMaxIterTrackRef;     //!for track refernce iterator routines
   Int_t         fCurrentIterTrackRef; //!for track refernce iterator routines
 

diff --git a/TPC/AliTPC.cxx b/TPC/AliTPC.cxx
index 08bf095d5b00325441aa993127406fb2ba95d665..f08e3fb4cab032095fcfd3420e5cf6e6681046cf 100644 (file)
--- a/TPC/AliTPC.cxx
+++ b/TPC/AliTPC.cxx
@@ -2239,14 +2239,6 @@ void AliTPC::SetTreeAddress2()
 //     else
 //       AliDebug(1,"fHitType&2 Failed (can not find branch)");
 //   }
-  //set address to TREETR
-  
-  TTree *treeTR = TreeTR();
-  if (treeTR && fTrackReferences) {
-    branch = treeTR->GetBranch(GetName());
-    if (branch) branch->SetAddress(&fTrackReferences);
-  }
-
 }
 
 void AliTPC::FinishPrimary()