correct the implementation of deleting tracker containers

diff --git a/TRD/AliTRDtrackerV1.cxx b/TRD/AliTRDtrackerV1.cxx
index 4054e009c7f33151ae9f11c55c996f94fbe9c78c..8666a466548ae5b4bf219c06007549504dd78981 100644 (file)
--- a/TRD/AliTRDtrackerV1.cxx
+++ b/TRD/AliTRDtrackerV1.cxx
@@ -1794,7 +1794,7 @@ Int_t AliTRDtrackerV1::BuildTrackingContainers()
 
 
 //____________________________________________________________________
-void AliTRDtrackerV1::UnloadClusters(Bool_t force) 
+void AliTRDtrackerV1::UnloadClusters() 
 { 
 //
 // Clears the arrays of clusters and tracks. Resets sectors and timebins 
@@ -1803,11 +1803,11 @@ void AliTRDtrackerV1::UnloadClusters(Bool_t force)
 
   if(fTracks){ 
     fTracks->Delete(); 
-    if(force){delete fTracks; fTracks = 0x0;}
+    if(HasRemoveContainers()){delete fTracks; fTracks = 0x0;}
   }
   if(fTracklets){ 
     fTracklets->Delete();
-    if(force){delete fTracklets; fTracklets = 0x0;}
+    if(HasRemoveContainers()){delete fTracklets; fTracklets = 0x0;}
   }
   if(fClusters){ 
     if(IsClustersOwner()) fClusters->Delete();

diff --git a/TRD/AliTRDtrackerV1.h b/TRD/AliTRDtrackerV1.h
index f151e440ab41bd5118b674506684c5112649e2e7..d8a9069604ddd6e5a5893b6285c1f1f90c919a4b 100644 (file)
--- a/TRD/AliTRDtrackerV1.h
+++ b/TRD/AliTRDtrackerV1.h
@@ -50,7 +50,8 @@ class AliTRDtrackerV1 : public AliTracker
 {
 public:
   enum{
-    kOwner = BIT(14)
+    kOwner            = BIT(14) // owner of clusters
+   ,kRemoveContainers = BIT(15) // delete containers after usage
   };
   enum{
     kMaxLayersPerSector   = 1000
@@ -91,7 +92,9 @@ public:
   static Double_t FitKalman(AliTRDtrackV1 *trk, AliTRDseedV1 *tracklets = 0x0, Bool_t up=0, Int_t np = 0, AliTrackPoint *points = 0x0);
 
   Bool_t          IsClustersOwner() const    { return TestBit(kOwner);}
+  Bool_t          HasRemoveContainers() const    { return TestBit(kRemoveContainers);}
   void            SetClustersOwner(Bool_t own=kTRUE) {SetBit(kOwner, own); if(!own) fClusters = 0x0;}
+  void            SetRemoveContainers(Bool_t rm=kTRUE) {SetBit(kRemoveContainers, rm);}
 
   Int_t           FollowBackProlongation(AliTRDtrackV1 &t);
   Int_t           FollowProlongation(AliTRDtrackV1 &t);
@@ -103,7 +106,7 @@ public:
   Int_t           RefitInward(AliESDEvent *event);
   static void     SetNTimeBins(Int_t nTimeBins){fgNTimeBins = nTimeBins; }
   void            SetReconstructor(const AliTRDReconstructor *rec){ fReconstructor = rec; }
-  void            UnloadClusters(Bool_t force=kFALSE);
+  void            UnloadClusters();
 
   class AliTRDLeastSquare{
   public: