X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTracker.cxx;h=eccf3727953412cb90ddc6630c2190acb4ce3620;hb=48c9fd730c3194d4e5396b1c2ac364c76c3168bc;hp=cee4276bc72fe0ad0895bf715088a1f0c3b3c1be;hpb=70d92702ce82b1d6e1e9b62ec50a0a811852bb7f;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUONTracker.cxx b/MUON/AliMUONTracker.cxx index cee4276bc72..eccf3727953 100644 --- a/MUON/AliMUONTracker.cxx +++ b/MUON/AliMUONTracker.cxx @@ -54,10 +54,11 @@ #include "AliMUONVClusterServer.h" #include "AliMUONVDigitStore.h" #include "AliMUONVTriggerStore.h" -#include "AliMUONDigitMaker.h" +#include "AliMUONTriggerUtilities.h" #include #include #include +#include "AliLog.h" /// \cond CLASSIMP ClassImp(AliMUONTracker) @@ -68,11 +69,10 @@ ClassImp(AliMUONTracker) AliMUONTracker::AliMUONTracker(const AliMUONRecoParam* recoParam, AliMUONVClusterServer* clusterServer, AliMUONVDigitStore& digitStore, - const AliMUONDigitMaker* digitMaker, const AliMUONGeometryTransformer* transformer, - const AliMUONTriggerCircuit* triggerCircuit) + const AliMUONTriggerCircuit* triggerCircuit, + const AliMUONTriggerUtilities* triggerUtilities) : AliTracker(), -fkDigitMaker(digitMaker), // not owner fkTransformer(transformer), // not owner fkTriggerCircuit(triggerCircuit), // not owner fTrackHitPatternMaker(0x0), @@ -84,11 +84,13 @@ fIsOwnerOfClusterServer(kFALSE), fkDigitStore(digitStore), // not owner fInputClusterStore(0x0), fTriggerTrackStore(0x0), -fkRecoParam(recoParam) +fkRecoParam(recoParam), +fInternalTrackStore(0x0) { /// constructor - if (fkTransformer && fkDigitMaker) - fTrackHitPatternMaker = new AliMUONTrackHitPattern(recoParam,*fkTransformer,*fkDigitMaker); + + if (fkTransformer) + fTrackHitPatternMaker = new AliMUONTrackHitPattern(recoParam,*fkTransformer,fkDigitStore,triggerUtilities); if (!fClusterServer) { @@ -108,6 +110,7 @@ fkRecoParam(recoParam) AliMUONTracker::~AliMUONTracker() { /// dtor + delete fTrackReco; delete fTrackHitPatternMaker; delete fClusterStore; @@ -115,6 +118,7 @@ AliMUONTracker::~AliMUONTracker() if ( fIsOwnerOfClusterServer ) delete fClusterServer; delete fInputClusterStore; delete fTriggerTrackStore; + delete fInternalTrackStore; } //_____________________________________________________________________________ @@ -146,16 +150,15 @@ Int_t AliMUONTracker::LoadClusters(TTree* clustersTree) { /// Load triggerStore from clustersTree - delete fTriggerStore; - delete fInputClusterStore; - fInputClusterStore=0x0; - if ( ! clustersTree ) { AliFatal("No clustersTree"); return 1; } - fTriggerStore = AliMUONVTriggerStore::Create(*clustersTree); + if ( !fTriggerStore ) + { + fTriggerStore = AliMUONVTriggerStore::Create(*clustersTree); + } if (!fTriggerStore) { @@ -163,22 +166,32 @@ Int_t AliMUONTracker::LoadClusters(TTree* clustersTree) return 2; } - if ( fIsOwnerOfClusterServer ) + if (!fInputClusterStore) { fInputClusterStore = AliMUONVClusterStore::Create(*clustersTree); - if ( fInputClusterStore ) + if (!fInputClusterStore) { - AliDebug(1,Form("Created %s from cluster tree",fInputClusterStore->ClassName())); - fInputClusterStore->Clear(); - fInputClusterStore->Connect(*clustersTree,kFALSE); + AliError("Could not get clusterStore"); + return 3; } - delete fClusterServer; - fClusterServer = new AliMUONLegacyClusterServer(*fkTransformer,fInputClusterStore, - GetRecoParam()->BypassSt4(), - GetRecoParam()->BypassSt5()); - SetupClusterServer(*fClusterServer); + AliDebug(1,Form("Created %s from cluster tree",fInputClusterStore->ClassName())); + } + + if ( !fClusterServer && fIsOwnerOfClusterServer ) + { + if ( !fClusterServer ) + { + fClusterServer = new AliMUONLegacyClusterServer(*fkTransformer,fInputClusterStore, + GetRecoParam()->BypassSt4(), + GetRecoParam()->BypassSt5()); + SetupClusterServer(*fClusterServer); + } + } + fInputClusterStore->Clear(); + fInputClusterStore->Connect(*clustersTree,kFALSE); + fTriggerStore->Clear(); fTriggerStore->Connect(*clustersTree,kFALSE); clustersTree->GetEvent(0); @@ -190,12 +203,21 @@ Int_t AliMUONTracker::LoadClusters(TTree* clustersTree) Int_t AliMUONTracker::Clusters2Tracks(AliESDEvent* esd) { /// Performs the tracking and store the resulting tracks in the ESD - AliDebug(1,""); - AliCodeTimerAuto("",) + /// + /// note that we're dealing with two cluster stores here : fInputClusterStore + /// and ClusterStore(). + /// The first one is read from the TreeR and may be used by the cluster server + /// (that's the case for the legacy cluster server) to fill the other one. + /// The second one is more dynamic and might be created on the fly by the cluster + /// server (used by the combined tracking, in which case the first one is not used + /// at all). + + AliCodeTimerAuto("",0) if (!fTrackReco) { - fTrackReco = CreateTrackReconstructor(GetRecoParam(),fClusterServer); + fTrackReco = CreateTrackReconstructor(GetRecoParam(),fClusterServer,fkTransformer); + fInternalTrackStore = new AliMUONTrackStoreV1; } // if the required tracking mode does not exist @@ -223,7 +245,7 @@ Int_t AliMUONTracker::Clusters2Tracks(AliESDEvent* esd) { // cut to reject shower events - AliCodeTimerAuto("MUON Shower events",0); + AliCodeTimerAuto("MUON Shower events",1); AliWarning(Form("Probably got a shower event (%d trigger tracks). Will not reconstruct tracks.", TriggerTrackStore()->GetSize())); @@ -231,21 +253,19 @@ Int_t AliMUONTracker::Clusters2Tracks(AliESDEvent* esd) return 0; } - // Make tracker tracks - AliMUONVTrackStore* trackStore = new AliMUONTrackStoreV1; - fTrackReco->EventReconstruct(*(ClusterStore()),*trackStore); + fTrackReco->EventReconstruct(*(ClusterStore()),*fInternalTrackStore); // Match tracker/trigger tracks if ( fTrackHitPatternMaker ) { - fTrackReco->ValidateTracksWithTrigger(*trackStore,*(TriggerTrackStore()),*fTriggerStore,*fTrackHitPatternMaker); + fTrackReco->ValidateTracksWithTrigger(*fInternalTrackStore,*(TriggerTrackStore()),*fTriggerStore,*fTrackHitPatternMaker); } // Fill ESD - FillESD(*trackStore,esd); + FillESD(*fInternalTrackStore,esd); - // cleanup - delete trackStore; + fInternalTrackStore->Clear(); + ClusterStore()->Clear(); return 0; } @@ -255,12 +275,12 @@ void AliMUONTracker::FillESD(const AliMUONVTrackStore& trackStore, AliESDEvent* { /// Fill the ESD from the trackStore AliDebug(1,""); - AliCodeTimerAuto("",) + AliCodeTimerAuto("",0) // get ITS vertex Double_t vertex[3] = {0., 0., 0.}; const AliESDVertex* esdVert = esd->GetVertex(); - if (esdVert->GetNContributors()) { + if (esdVert->GetNContributors() > 0 || !strcmp(esdVert->GetTitle(),"vertexer: smearMC")) { esdVert->GetXYZ(vertex); AliDebug(1,Form("found vertex (%e,%e,%e)",vertex[0],vertex[1],vertex[2])); } @@ -268,7 +288,6 @@ void AliMUONTracker::FillESD(const AliMUONVTrackStore& trackStore, AliESDEvent* // fill ESD event including all info in ESD cluster if required and only for the given fraction of events AliMUONTrack* track; AliMUONLocalTrigger* locTrg; - AliESDMuonTrack esdTrack; TIter next(trackStore.CreateIterator()); if (GetRecoParam()->SaveFullClusterInESD() && gRandom->Uniform(100.) <= GetRecoParam()->GetPercentOfFullClusterInESD()) { @@ -277,10 +296,9 @@ void AliMUONTracker::FillESD(const AliMUONVTrackStore& trackStore, AliESDEvent* if (track->GetMatchTrigger() > 0) { locTrg = static_cast(fTriggerStore->FindLocal(track->LoCircuit())); - AliMUONESDInterface::MUONToESD(*track, esdTrack, vertex, &fkDigitStore, locTrg); - } else AliMUONESDInterface::MUONToESD(*track, esdTrack, vertex, &fkDigitStore); + AliMUONESDInterface::MUONToESD(*track, *esd, vertex, &fkDigitStore, locTrg); + } else AliMUONESDInterface::MUONToESD(*track, *esd, vertex, &fkDigitStore); - esd->AddMuonTrack(&esdTrack); } } else { @@ -289,10 +307,9 @@ void AliMUONTracker::FillESD(const AliMUONVTrackStore& trackStore, AliESDEvent* if (track->GetMatchTrigger() > 0) { locTrg = static_cast(fTriggerStore->FindLocal(track->LoCircuit())); - AliMUONESDInterface::MUONToESD(*track, esdTrack, vertex, 0x0, locTrg); - } else AliMUONESDInterface::MUONToESD(*track, esdTrack, vertex); + AliMUONESDInterface::MUONToESD(*track, *esd, vertex, 0x0, locTrg); + } else AliMUONESDInterface::MUONToESD(*track, *esd, vertex); - esd->AddMuonTrack(&esdTrack); } } @@ -314,16 +331,17 @@ void AliMUONTracker::FillESD(const AliMUONVTrackStore& trackStore, AliESDEvent* } if (matched) continue; - AliMUONESDInterface::MUONToESD(*locTrg, esdTrack, ghostId, triggerTrack); + AliMUONESDInterface::MUONToESD(*locTrg, *esd, ghostId, triggerTrack); - esd->AddMuonTrack(&esdTrack); ghostId -= 1; } } //_____________________________________________________________________________ -AliMUONVTrackReconstructor* AliMUONTracker::CreateTrackReconstructor(const AliMUONRecoParam* recoParam, AliMUONVClusterServer* clusterServer) +AliMUONVTrackReconstructor* AliMUONTracker::CreateTrackReconstructor(const AliMUONRecoParam* recoParam, + AliMUONVClusterServer* clusterServer, + const AliMUONGeometryTransformer* transformer) { /// Create track reconstructor, depending on tracking mode set in RecoParam @@ -334,11 +352,11 @@ AliMUONVTrackReconstructor* AliMUONTracker::CreateTrackReconstructor(const AliMU if (strstr(opt,"ORIGINAL")) { - trackReco = new AliMUONTrackReconstructor(recoParam,clusterServer); + trackReco = new AliMUONTrackReconstructor(recoParam,clusterServer,transformer); } else if (strstr(opt,"KALMAN")) { - trackReco = new AliMUONTrackReconstructorK(recoParam,clusterServer); + trackReco = new AliMUONTrackReconstructorK(recoParam,clusterServer,transformer); } else { @@ -356,8 +374,7 @@ void AliMUONTracker::UnloadClusters() { /// Clear internal clusterStore - delete fInputClusterStore; - fInputClusterStore = 0x0; + fInputClusterStore->Clear(); }