Remove loader parameter, getting from MUONData (Christian)

diff --git a/MUON/AliMUONTrackReconstructor.cxx b/MUON/AliMUONTrackReconstructor.cxx
index 46ee6710926b075285c5408d3c266736987788b1..8f1292bf316ecff5f2409c151399c22d3c1719c9 100644 (file)
--- a/MUON/AliMUONTrackReconstructor.cxx
+++ b/MUON/AliMUONTrackReconstructor.cxx
@@ -51,8 +51,6 @@
 #include "AliMUONTrack.h"
 #include "AliMUONTrackHit.h"
 #include "AliMagF.h"
-//#include "AliRunLoader.h"
-#include "AliLoader.h"
 #include "AliMUONTrackK.h" 
 #include "AliLog.h"
 #include "AliTracker.h"
@@ -79,7 +77,7 @@ const Double_t AliMUONTrackReconstructor::fgkDefaultEfficiency = 0.95;
 ClassImp(AliMUONTrackReconstructor) // Class implementation in ROOT context
 
 //__________________________________________________________________________
-AliMUONTrackReconstructor::AliMUONTrackReconstructor(AliLoader* loader, AliMUONData* data)
+AliMUONTrackReconstructor::AliMUONTrackReconstructor(AliMUONData* data)
   : TObject(),
     fTrackMethod(1), //AZ - tracking method (1-default, 2-Kalman)
     fMinBendingMomentum(fgkDefaultMinBendingMomentum),
@@ -100,7 +98,6 @@ AliMUONTrackReconstructor::AliMUONTrackReconstructor(AliLoader* loader, AliMUOND
     fRecTrackHitsPtr(0x0),
     fNRecTrackHits(0),
     fMUONData(data),
-    fLoader(loader),
     fMuons(0),
     fTriggerTrack(new AliMUONTriggerTrack()),
     fTriggerCircuit(0x0)
@@ -312,7 +309,7 @@ void AliMUONTrackReconstructor::MakeEventToBeReconstructed(void)
   // Security on MUON ????
   // TreeR assumed to be be "prepared" in calling function
   // by "MUON->GetTreeR(nev)" ????
-  TTree *treeR = fLoader->TreeR();
+  TTree *treeR = fMUONData->TreeR();
 
   //AZ? fMUONData->SetTreeAddress("RC");
   AddHitsForRecFromRawClusters(treeR);
@@ -386,7 +383,7 @@ void AliMUONTrackReconstructor::AddHitsForRecFromRawClusters(TTree* TR)
       AliError(Form("nTRentries = %d not equal to 1 ",nTRentries));
       exit(0);
     }
-    fLoader->TreeR()->GetEvent(0); // only one entry  
+    fMUONData->GetRawClusters(); // only one entry  
   }
 
   // Loop over tracking chambers
@@ -635,7 +632,7 @@ Bool_t AliMUONTrackReconstructor::MakeTriggerTracks(void)
     AliMUONLocalTrigger *locTrg;
     AliMUONGlobalTrigger *gloTrg;
 
-    TTree* treeR = fLoader->TreeR();
+    TTree* treeR = fMUONData->TreeR();
    
     nTRentries = Int_t(treeR->GetEntries());
      

diff --git a/MUON/AliMUONTrackReconstructor.h b/MUON/AliMUONTrackReconstructor.h
index afdbc9885c99f2fb0d84762ee7b66a07e9fbce90..b085328248baeaaaf5bb1013a43798312ccb4d43 100644 (file)
--- a/MUON/AliMUONTrackReconstructor.h
+++ b/MUON/AliMUONTrackReconstructor.h
@@ -23,14 +23,13 @@ class TFile;
 class TTree;
 class AliMUONData;
 class AliRunLoader;
-class AliLoader;
 class AliMUONTriggerTrack;
 
 class AliMUONTrackReconstructor : public TObject {
 
  public:
-  AliMUONTrackReconstructor(AliLoader* loader, AliMUONData* data); // default Constructor
-  virtual ~AliMUONTrackReconstructor(void); // Destructor
+  AliMUONTrackReconstructor(AliMUONData* data); // default Constructor
+  virtual ~AliMUONTrackReconstructor(); // Destructor
 
   // Parameters for track reconstruction: public methods
   // Get and Set, Set to defaults
@@ -158,9 +157,6 @@ class AliMUONTrackReconstructor : public TObject {
   // data container
   AliMUONData* fMUONData; ///< Data container for MUON subsystem 
 
-  // alice loader
-  AliLoader* fLoader; ///< MUON loader to get data
-
   Int_t fMuons; ///< AZ - number of muons within acceptance - just for tests
 
   AliMUONTriggerTrack* fTriggerTrack; ///< Trigger track structure