Skip to content
Snippets Groups Projects
Commit 46da0650 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'Fix_Run3_SimScheduler' into 'master'

MM_Digitization: Ensure that the MuonDetectorCondAlg is present

See merge request atlas/athena!46895
parents 2415b035 06071497
No related branches found
No related tags found
No related merge requests found
......@@ -11,7 +11,7 @@ from MuonConfig.MuonByteStreamCnvTestConfig import MM_DigitToRDOCfg
from Digitization.TruthDigitizationOutputConfig import TruthDigitizationOutputCfg
from Digitization.PileUpToolsConfig import PileUpToolsCfg
from Digitization.PileUpMergeSvcConfigNew import PileUpMergeSvcCfg, PileUpXingFolderCfg
from MuonConfig.MuonGeometryConfig import MuonDetectorCondAlgCfg
# The earliest and last bunch crossing times for which interactions will be sent
# to the MMDigitizationTool.
......@@ -35,6 +35,7 @@ def MM_RangeCfg(flags, name="MMRange", **kwargs):
def MM_DigitizationToolCfg(flags, name="MM_DigitizationTool", **kwargs):
"""Return ComponentAccumulator with configured MM_DigitizationTool"""
acc = ComponentAccumulator()
acc.merge(MuonDetectorCondAlgCfg(flags))
rangetool = acc.popToolsAndMerge(MM_RangeCfg(flags))
acc.merge(PileUpMergeSvcCfg(flags, Intervals=rangetool))
if flags.Digitization.DoXingByXingPileUp:
......
......@@ -35,7 +35,11 @@ def MM_DigitizationTool(name="MM_DigitizationTool",**kwargs):
kwargs.setdefault("UseMcEventCollectionHelper",True)
else:
kwargs.setdefault("UseMcEventCollectionHelper",False)
from AthenaCommon.AlgSequence import AthSequencer
condSequence = AthSequencer("AthCondSeq")
if not hasattr(condSequence,"MuonDetectorCondAlg"):
import MuonRecExample.MuonAlignConfig # noqa: F401 (import side-effects)
return CfgMgr.MM_DigitizationTool(name,**kwargs)
def getMMRange(name="MMRange", **kwargs):
......
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