Fixing memory handling of AliHLTMUONHitReconstructorComponent during error conditions...

[u/mrichter/AliRoot.git] / TOF / AliTOFtrackerMI.cxx

diff --git a/TOF/AliTOFtrackerMI.cxx b/TOF/AliTOFtrackerMI.cxx
index 49e8907b4878acfd3fb1309405f59c1e7bb0e4a1..f0597f17dcf5eb81788d5cdedfe404084635f6cf 100644 (file)
--- a/TOF/AliTOFtrackerMI.cxx
+++ b/TOF/AliTOFtrackerMI.cxx
@@ -58,14 +58,14 @@ AliTOFtrackerMI::AliTOFtrackerMI():
   fnbadmatch(0),
   fnunmatch(0),
   fnmatch(0),
-  fR(378.), 
+  fR(379.), 
   fTOFHeigth(15.3),  
   fdCut(3.), 
   fDx(1.5), 
   fDy(0), 
   fDz(0), 
-  fTracks(0x0),
-  fSeeds(0x0),
+  fTracks(new TClonesArray("AliTOFtrack")),
+  fSeeds(new TClonesArray("AliESDtrack")),
   fDebugStreamer(0x0)
  { 
   //AliTOFtrackerMI main Ctor
@@ -93,14 +93,14 @@ AliTOFtrackerMI::AliTOFtrackerMI(const AliTOFtrackerMI &t):
   fnbadmatch(0),
   fnunmatch(0),
   fnmatch(0),
-  fR(378.), 
+  fR(379.), 
   fTOFHeigth(15.3),  
   fdCut(3.), 
   fDx(1.5), 
   fDy(0), 
   fDz(0), 
-  fTracks(0x0),
-  fSeeds(0x0),
+  fTracks(new TClonesArray("AliTOFtrack")),
+  fSeeds(new TClonesArray("AliESDtrack")),
   fDebugStreamer(0x0)
  { 
   //AliTOFtrackerMI copy Ctor
@@ -164,6 +164,16 @@ AliTOFtrackerMI::~AliTOFtrackerMI(){
   delete fRecoParam;
   delete fGeom;
   delete fPid;
+  if (fTracks){
+    fTracks->Delete();
+    delete fTracks;
+    fTracks=0x0;
+  }
+  if (fSeeds){
+    fSeeds->Delete();
+    delete fSeeds;
+    fSeeds=0x0;
+  }
 }
 
 //_____________________________________________________________________________
@@ -184,7 +194,6 @@ Int_t AliTOFtrackerMI::PropagateBack(AliESDEvent* event) {
 
   Int_t ntrk=event->GetNumberOfTracks();
   fNseeds = ntrk;
-  fSeeds= new TClonesArray("AliESDtrack");
   TClonesArray &aESDTrack = *fSeeds;
 
 
@@ -241,16 +250,8 @@ Int_t AliTOFtrackerMI::PropagateBack(AliESDEvent* event) {
   //Make TOF PID
   fPid->MakePID(event);
 
-  if (fSeeds) {
-    fSeeds->Delete();
-    delete fSeeds;
-    fSeeds = 0x0;
-  }
-  if (fTracks) {
-    fTracks->Delete();
-    delete fTracks;
-    fTracks = 0x0;
-  }
+  fSeeds->Clear();
+  fTracks->Clear();
   return 0;
   
 }
@@ -258,7 +259,6 @@ Int_t AliTOFtrackerMI::PropagateBack(AliESDEvent* event) {
 void AliTOFtrackerMI::CollectESD() {
    //prepare the set of ESD tracks to be matched to clusters in TOF
  
-  fTracks= new TClonesArray("AliTOFtrack");
   TClonesArray &aTOFTrack = *fTracks;
   Int_t c0=0;
   Int_t c1=0;
@@ -267,7 +267,7 @@ void AliTOFtrackerMI::CollectESD() {
     AliESDtrack *t =(AliESDtrack*)fSeeds->UncheckedAt(i);
     if ((t->GetStatus()&AliESDtrack::kTPCout)==0)continue;
 
-    // TRD good tracks, already propagated at 371 cm
+    // TRD good tracks, already propagated at 372 cm
 
     AliTOFtrack *track = new AliTOFtrack(*t); // New
     Double_t x = track->GetX(); //New
@@ -380,12 +380,12 @@ void AliTOFtrackerMI::MatchTracksMI(Bool_t mLastStep){
     //
     //propagat track to the middle of TOF
     //
-    Float_t xs = 378.2;  // should be defined in the TOF geometry
+    Float_t xs = 379.2;  // should be defined in the TOF geometry
     Double_t ymax=xs*TMath::Tan(0.5*AliTOFGeometry::GetAlpha());  
     Bool_t skip=kFALSE;
     Double_t ysect=trackTOFin->GetYat(xs,skip);
     if (skip){
-      xs = 372.;
+      xs = 373.;
       ymax=xs*TMath::Tan(0.5*AliTOFGeometry::GetAlpha());
       ysect=trackTOFin->GetYat(xs,skip);
     }
@@ -584,7 +584,7 @@ void AliTOFtrackerMI::MatchTracksMI(Bool_t mLastStep){
     t->SetTOFsignal(tof2);
     t->SetTOFcluster(cgold->GetIndex());  
     AliTOFtrack *trackTOFout = new AliTOFtrack(*t); 
-    trackTOFout->PropagateTo(378.);
+    trackTOFout->PropagateTo(379.);
     t->UpdateTrackParams(trackTOFout,AliESDtrack::kTOFout);    
     t->SetIntegratedLength(length[igold]);
     t->SetIntegratedTimes(times[igold]);
@@ -669,7 +669,9 @@ Int_t AliTOFtrackerMI::LoadClusters(TTree *cTree) {
     return 1;
   }
 
-  TClonesArray dummy("AliTOFcluster",10000), *clusters=&dummy;
+  static TClonesArray dummy("AliTOFcluster",10000);
+  dummy.Clear();
+  TClonesArray *clusters=&dummy;
   branch->SetAddress(&clusters);
 
   cTree->GetEvent(0);