From e16f9486bb87ceaa24f5a648c92d9bdcbe83bb43 Mon Sep 17 00:00:00 2001
From: Hass AbouZeid <hass.abouzeid@cern.ch>
Date: Tue, 16 May 2017 15:41:06 +0000
Subject: [PATCH] Merge branch 'combinedRecOffCosmics' into '21.0'
Fix combined muon reco for cosmics (ATLASRECTS-3998)
See merge request !1743
Former-commit-id: d0465827610b670c74b8362a64e8ad0b41d6c4d8
---
.../MuonCombinedRecExample/python/MuonCombinedAlgs.py | 6 +++---
.../MuonCombinedRecExample/python/MuonCombinedTools.py | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
index b933d9036e52..7a0c02678479 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
@@ -82,10 +82,10 @@ class MuonCombinedReconstruction(ConfiguredMuonRec):
topSequence = AlgSequence()
- if jobproperties.Beam.beamType()=='collisions':
+ #if jobproperties.Beam.beamType()=='collisions':
# creates input collections for ID and MS candidates
- topSequence += getAlgorithm("MuonCombinedInDetCandidateAlg")
- topSequence += getAlgorithm("MuonCombinedMuonCandidateAlg")
+ topSequence += getAlgorithm("MuonCombinedInDetCandidateAlg")
+ topSequence += getAlgorithm("MuonCombinedMuonCandidateAlg")
# runs ID+MS combinations (fit, staco, mugirl, ID-taggers)
if muonCombinedRecFlags.doStatisticalCombination() or muonCombinedRecFlags.doCombinedFit():
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py
index 527aa585c533..7ef023a449b9 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py
@@ -59,6 +59,8 @@ def MuonCombinedParticleCreator(name="MuonCombinedParticleCreator",**kwargs):
kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary ) #getPublicTool("CombinedMuonTrackSummary") )
kwargs.setdefault("KeepAllPerigee",True )
kwargs.setdefault("UseMuonSummaryTool",True )
+ if beamFlags.beamType() == 'cosmics':
+ kwargs.setdefault("PerigeeExpression","Origin")
return CfgMgr.Trk__TrackParticleCreatorTool(name,**kwargs)
def MuonCaloParticleCreator(name="MuonCaloParticleCreator",**kwargs):
--
GitLab