Changing RunMuonTracking (Laurent)

diff --git a/STEER/AliReconstruction.cxx b/STEER/AliReconstruction.cxx
index 2706d37b5986d501f44e930030936a78d37ce455..13977bcd42e614027dfe5f8927f61f70e99dcb2e 100644 (file)
--- a/STEER/AliReconstruction.cxx
+++ b/STEER/AliReconstruction.cxx
@@ -694,7 +694,7 @@ Bool_t AliReconstruction::Run(const char* input)
     // Muon tracking
     if (!fRunTracking.IsNull()) {
       if (fRunMuonTracking) {
-       if (!RunMuonTracking()) {
+       if (!RunMuonTracking(esd)) {
          if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;}
        }
       }
@@ -1075,7 +1075,7 @@ Bool_t AliReconstruction::RunHLTTracking(AliESD*& esd)
 }
 
 //_____________________________________________________________________________
-Bool_t AliReconstruction::RunMuonTracking()
+Bool_t AliReconstruction::RunMuonTracking(AliESD*& esd)
 {
 // run the muon spectrometer tracking
 
@@ -1109,12 +1109,21 @@ Bool_t AliReconstruction::RunMuonTracking()
   fLoader[iDet]->MakeTracksContainer();
 
   // read RecPoints
-  fLoader[iDet]->LoadRecPoints("read");
-
-  if (!tracker->Clusters2Tracks(0x0)) {
+  fLoader[iDet]->LoadRecPoints("read");  
+  tracker->LoadClusters(fLoader[iDet]->TreeR());
+  
+  Int_t rv = tracker->Clusters2Tracks(esd);
+  
+  fLoader[iDet]->UnloadRecPoints();
+  
+  if ( rv )
+  {
     AliError(Form("%s Clusters2Tracks failed", fgkDetectorName[iDet]));
     return kFALSE;
   }
+  
+  tracker->UnloadClusters();
+  
   fLoader[iDet]->UnloadRecPoints();
 
   fLoader[iDet]->WriteTracks("OVERWRITE");
@@ -1122,7 +1131,6 @@ Bool_t AliReconstruction::RunMuonTracking()
 
   delete tracker;
   
-
   AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
               stopwatch.RealTime(),stopwatch.CpuTime()));
 

diff --git a/STEER/AliReconstruction.h b/STEER/AliReconstruction.h
index e864ffb0311e4378d7bfe8857b9ca0767d92757c..27832c065aca95ae1437775d7df88b5559b6f198 100644 (file)
--- a/STEER/AliReconstruction.h
+++ b/STEER/AliReconstruction.h
@@ -107,7 +107,7 @@ private:
   Bool_t         RunLocalEventReconstruction(const TString& detectors);
   Bool_t         RunVertexFinder(AliESD*& esd);
   Bool_t         RunHLTTracking(AliESD*& esd);
-  Bool_t         RunMuonTracking();
+  Bool_t         RunMuonTracking(AliESD*& esd);
   Bool_t         RunTracking(AliESD*& esd);
   Bool_t         FillESD(AliESD*& esd, const TString& detectors);
   Bool_t         FillTriggerESD(AliESD*& esd);