diff --git a/Simulation/Digitization/python/DigitizationConfigFlags.py b/Simulation/Digitization/python/DigitizationConfigFlags.py index 0a9b688717fc01c31fce3f8f50bd61d516546201..9bd2e33ff737f667d4c49bc24e0e364e21fda3ee 100644 --- a/Simulation/Digitization/python/DigitizationConfigFlags.py +++ b/Simulation/Digitization/python/DigitizationConfigFlags.py @@ -64,6 +64,9 @@ def constBunchSpacingPattern(constBunchSpacing): def createDigitizationCfgFlags(): """Return an AthConfigFlags object with required flags""" flags = AthConfigFlags() + # Digitization Steering - needed for easy comparison with the + # old-style configuration, but can potentially drop + flags.addFlag("Digitization.DigiSteeringConf", "StandardPileUpToolsAlg") # Run Inner Detector noise simulation flags.addFlag("Digitization.DoInnerDetectorNoise", True) # Run pile-up digitization on one bunch crossing at a time? diff --git a/Simulation/Digitization/python/PileUpToolsConfig.py b/Simulation/Digitization/python/PileUpToolsConfig.py index e8b4af5e4624d99f33f7d2916b1510429d1904e6..35b913ddd1b2b999461c417010fa84b0bcd03ccc 100644 --- a/Simulation/Digitization/python/PileUpToolsConfig.py +++ b/Simulation/Digitization/python/PileUpToolsConfig.py @@ -7,7 +7,7 @@ from AthenaConfiguration.ComponentFactory import CompFactory PileUpToolsAlg, DigitizationAlg=CompFactory.getComps("PileUpToolsAlg","DigitizationAlg") -def PileUpToolsCfg(flags, name="StandardPileUpToolsAlg", **kwargs): +def PileUpToolsCfg(flags, **kwargs): """ Return ComponentAccumulator with the correct algorithm to carry Digitization PileUpTools @@ -29,5 +29,5 @@ def PileUpToolsCfg(flags, name="StandardPileUpToolsAlg", **kwargs): else: Alg = DigitizationAlg - acc.addEventAlgo(Alg(name, **kwargs)) + acc.addEventAlgo(Alg(flags.Digitization.DigiSteeringConf, **kwargs)) return acc