Skip to content
Snippets Groups Projects
Commit c7dabb4e authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'config.MuonConfig-20200129' into 'master'

MuonConfig: Fix configuration-related test failure.

See merge request !29889
parents fb91d8bf 3509eb41
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!29889MuonConfig: Fix configuration-related test failure.
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
......@@ -165,6 +165,12 @@ def MooTrackBuilderCfg(flags, name="MooTrackBuilderTemplate", **kwargs):
track_segment_matching_tool=acc.getPrimary()
result.merge(acc)
kwargs.setdefault("CandidateMatchingTool", track_segment_matching_tool)
from MuonConfig.MuonRecToolsConfig import MuonTrackSummaryHelperToolCfg
acc = MuonTrackSummaryHelperToolCfg(flags)
track_summary_helper = acc.getPrimary()
result.merge(acc)
kwargs.setdefault("TrackSummaryTool", track_summary_helper)
builder = Muon__MooTrackBuilder(name, **kwargs)
result.setPrivateTools(builder)
......@@ -290,6 +296,12 @@ def MuonSegmentRegionRecoveryToolCfg(flags, name="MuonSegmentRegionRecoveryTool"
result.merge(acc)
kwargs.setdefault("MuonStationIntersectSvc",msis)
from MuonConfig.MuonRecToolsConfig import MuonTrackSummaryHelperToolCfg
acc = MuonTrackSummaryHelperToolCfg(flags)
track_summary_helper = acc.getPrimary()
result.merge(acc)
kwargs.setdefault("TrackSummaryTool", track_summary_helper)
# Not bothering to handle IDHelper or EDMHelper or HitSummaryTool. Default is okay.
# FIXME - this should probably be a CA?
......@@ -437,6 +449,12 @@ def MuonTrackSteeringCfg(flags, name="MuonTrackSteering", **kwargs):
kwargs.setdefault("HoleRecoveryTool", hole_recovery_tool)
from MuonConfig.MuonRecToolsConfig import MuonTrackSummaryHelperToolCfg
acc = MuonTrackSummaryHelperToolCfg(flags)
track_summary_helper = acc.getPrimary()
result.merge(acc)
kwargs.setdefault("TrackSummaryTool", track_summary_helper)
track_maker_steering = Muon__MuonTrackSteering(name,**kwargs)
result.setPrivateTools(track_maker_steering)
return result
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment