From 764dada30691dc453d1780475d65dd65b465c640 Mon Sep 17 00:00:00 2001
From: Savanna Marie Shaw <savanna.marie.shaw@cern.ch>
Date: Thu, 26 Mar 2020 11:56:20 +0100
Subject: [PATCH] Bug fixes for combined muon config
Fixing a couple of bugs in the combined muon configuration:
- Merge the component accumulator for the ExtrapolateMuonToIPTool only when the tool is needed (in cosmics)
- Update a couple of instances of the MuidCaloEnergyParam to be the MuidCaloEnergyToolParam as the tool using this expects that later type of tool.
---
.../MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
index 4963ff9e1698..ad259eaa7cc5 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
@@ -195,7 +195,7 @@ def MuonCandidateToolCfg(flags, name="MuonCandidateTool",**kwargs):
extrapolator = acc.popPrivateTools()
result.addPublicTool(extrapolator)
kwargs.setdefault("TrackExtrapolationTool", extrapolator )
- result.merge(acc)
+ result.merge(acc)
acc = MuonAmbiProcessorCfg(flags)
ambiguityprocessor = acc.popPrivateTools()
@@ -389,8 +389,8 @@ def MuidCaloTrackStateOnSurfaceParamCfg(flags, name='MuidCaloTrackStateOnSurface
kwargs.setdefault("Propagator", CompFactory.Trk__RungeKuttaPropagator(name = 'AtlasRungeKuttaPropagator'))# FIXME - there should be a CA for this!
kwargs.setdefault("MinRemainingEnergy" , 0.2*GeV )
kwargs.setdefault("ParamPtCut" , 3.0*GeV )
- kwargs.setdefault("CaloEnergyDeposit" , MuidCaloEnergyParam(flags) )
- kwargs.setdefault("CaloEnergyParam" , MuidCaloEnergyParam(flags) )
+ kwargs.setdefault("CaloEnergyDeposit" , MuidCaloEnergyToolParam(flags) )
+ kwargs.setdefault("CaloEnergyParam" , MuidCaloEnergyToolParam(flags) )
tool = CompFactory.Rec__MuidCaloTrackStateOnSurface(name,**kwargs)
result.setPrivateTools(tool)
return result
--
GitLab