X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTracker.cxx;h=8b7a69587ce672c8752074c89d3540d56ae37e2a;hb=c0f00184e2e4a487fae8d768cf3ecc9f9ff6c5ed;hp=5937010baabbb0c3e3a15334e49836c75f130011;hpb=60765b06290ca3415474baf4f767e5132b669994;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUONTracker.cxx b/MUON/AliMUONTracker.cxx index 5937010baab..8b7a69587ce 100644 --- a/MUON/AliMUONTracker.cxx +++ b/MUON/AliMUONTracker.cxx @@ -44,8 +44,8 @@ #include "AliESDEvent.h" #include "AliESDMuonTrack.h" #include "AliESDVertex.h" -#include "AliLoader.h" #include "AliLog.h" +#include "AliCodeTimer.h" #include #include @@ -56,13 +56,11 @@ ClassImp(AliMUONTracker) //_____________________________________________________________________________ -AliMUONTracker::AliMUONTracker(AliLoader* loader, - const AliMUONDigitMaker* digitMaker, +AliMUONTracker::AliMUONTracker(const AliMUONDigitMaker* digitMaker, const AliMUONGeometryTransformer* transformer, const AliMUONTriggerCircuit* triggerCircuit, AliMUONTriggerChamberEff* chamberEff) : AliTracker(), - fLoader(loader), fDigitMaker(digitMaker), // not owner fTransformer(transformer), // not owner fTriggerCircuit(triggerCircuit), // not owner @@ -127,14 +125,9 @@ AliMUONTracker::Clusters2Tracks(AliESDEvent* esd) /// the TreeT and the ESD Int_t rv(0); - - TTree* tracksTree = fLoader->TreeT(); - - if (!tracksTree) - { - AliError("Cannot get TreeT"); - rv=1; - } + + TTree *tracksTree = new TTree; + if (!fClusterStore) { AliError("ClusterStore is NULL"); @@ -156,8 +149,8 @@ AliMUONTracker::Clusters2Tracks(AliESDEvent* esd) Int_t AliMUONTracker::Clusters2Tracks(TTree& tracksTree, AliESDEvent* esd) { /// Performs the tracking - AliDebug(1,""); + AliCodeTimerAuto("") AliMUONVTrackStore* trackStore(0x0); AliMUONVTriggerTrackStore* triggerTrackStore(0x0); @@ -186,10 +179,12 @@ Int_t AliMUONTracker::Clusters2Tracks(TTree& tracksTree, AliESDEvent* esd) } // Fills output TreeT - tracksTree.Fill(); + //tracksTree.Fill(); if( trackStore && triggerTrackStore && fTriggerStore && fTrigChamberEff){ + AliCodeTimerStart("EventChamberEff"); fTrigChamberEff->EventChamberEff(*fTriggerStore,*triggerTrackStore,*trackStore); + AliCodeTimerStop("EventChamberEff"); } FillESD(*trackStore,esd); @@ -206,8 +201,8 @@ void AliMUONTracker::FillESD(AliMUONVTrackStore& trackStore, AliESDEvent* esd) const { /// Fill the ESD from the trackStore - AliDebug(1,""); + AliCodeTimerAuto("") // Get vertex Double_t vertex[3] = {0};