From cf10d3cfab7f300853c0f8891eec543ca8c9df47 Mon Sep 17 00:00:00 2001
From: Edward Moyse <edward.moyse@cern.ch>
Date: Thu, 25 Mar 2021 09:21:54 +0100
Subject: [PATCH] Handle doSegmentPhiMatching correctly More old/new
configuration fixes
---
MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py | 2 +-
MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py
index 3a10fa615b0a..313e9a5a0da6 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py
@@ -266,7 +266,7 @@ def MuonExtrapolatorCfg(flags,name = "MuonExtrapolator", **kwargs):
kwargs.setdefault("Navigator", navigator)
if 'Propagators' not in kwargs:
- acc = MuonSTEP_PropagatorCfg(flags, Tolerance = 0.00001, MaterialEffects=True, IncludeBgradients=True)
+ acc = MuonSTEP_PropagatorCfg(flags, name="MuonPropagator", Tolerance = 0.00001, MaterialEffects=True, IncludeBgradients=True)
muon_prop = acc.getPrimary()
result.merge(acc)
result.addPublicTool(muon_prop)
diff --git a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
index 812e254a6e5a..509f4c5275a9 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
@@ -200,7 +200,7 @@ def MuonSegmentMatchingToolCfg(flags, name="MuonSegmentMatchingTool", **kwargs):
result.setPrivateTools(matching)
return result
-def MooCandidateMatchingToolCfg(flags, name="MooCandidateMatchingTool", doSegmentPhiMatching=True, **kwargs):
+def MooCandidateMatchingToolCfg(flags, name="MooCandidateMatchingTool", doSegmentPhiMatching=False, **kwargs):
Muon__MooCandidateMatchingTool=CompFactory.Muon.MooCandidateMatchingTool
from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
from MuonConfig.MuonRecToolsConfig import MuonExtrapolatorCfg
@@ -464,7 +464,7 @@ def MuonTrackSteeringCfg(flags, name="MuonTrackSteering", **kwargs):
kwargs.setdefault("MooBuilderTool", builder)
kwargs.setdefault("TrackRefinementTool", builder)
- acc = MooCandidateMatchingToolCfg(flags)
+ acc = MooCandidateMatchingToolCfg(flags, doSegmentPhiMatching=True)
cand_matching_tool = acc.getPrimary()
kwargs["CandidateMatchingTool"] = cand_matching_tool
result.merge(acc)
--
GitLab