diff --git a/TileCalorimeter/TileSimAlgs/python/TileDigitsGetter.py b/TileCalorimeter/TileSimAlgs/python/TileDigitsGetter.py index f63cbfd73bd28d51485be565172ccfe73b403b2c..0d940792485799641310aa9231faf52a62f11cb0 100644 --- a/TileCalorimeter/TileSimAlgs/python/TileDigitsGetter.py +++ b/TileCalorimeter/TileSimAlgs/python/TileDigitsGetter.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # Author: J. Poveda (Ximo.Poveda@cern.ch) # TileDigits creation from TileHit @@ -64,7 +64,10 @@ class TileDigitsGetter ( Configured ) : theTileDigitsMaker.CalibrationRun=False # Save integer numbers in digits vector if not pile-up premixing - theTileDigitsMaker.IntegerDigits = not digitizationFlags.PileUpPremixing() + theTileDigitsMaker.IntegerDigits = not digitizationFlags.PileUpPremixing() + + from TileConditions.TileConditionsConf import TileCondToolNoiseSample + theTileDigitsMaker.TileCondToolNoiseSample = TileCondToolNoiseSample (TileOnlineSampleNoise = '') # sets output key if digitizationFlags.PileUpPremixing and 'OverlayMT' in digitizationFlags.experimentalDigi(): diff --git a/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py b/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py index 7f4997c3b43b6ce5e066aa7c59d5bfb3776c37ae..98d2650d2b2c60fa6c4981aa36c98d2a180a8e14 100644 --- a/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py +++ b/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py @@ -157,6 +157,7 @@ if doTileDigitToRawChannel: theTileRawChannelGetter_DigiHSTruth.TileRawChannelContainer = "TileRawChannelCnt_DigiHSTruth" TileRChMaker = theTileRawChannelGetter.TileRChMaker() + if digitizationFlags.PileUpPremixing and 'OverlayMT' in digitizationFlags.experimentalDigi(): TileRChMaker.TileDigitsContainer = overlayFlags.bkgPrefix() + 'TileDigitsCnt' diff --git a/TileCalorimeter/TileSimAlgs/share/TileMuonReceiver_jobOptions.py b/TileCalorimeter/TileSimAlgs/share/TileMuonReceiver_jobOptions.py index 5137a1aaf6bff61e3a9698721c6a78fcc3de95ca..74e380ace937e2d20815a9b0ffec09686474ae7a 100644 --- a/TileCalorimeter/TileSimAlgs/share/TileMuonReceiver_jobOptions.py +++ b/TileCalorimeter/TileSimAlgs/share/TileMuonReceiver_jobOptions.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # # **************************************************************************** @@ -45,13 +45,15 @@ from AthenaCommon.AlgSequence import AlgSequence topSequence = AlgSequence() # Set up TilePulseForTileMuonReceiver +from TileConditions.TileConditionsConf import TileCondToolNoiseSample topSequence += CfgMgr.TilePulseForTileMuonReceiver('TilePulseForTileMuonReceiver' # , OutputLevel = VERBOSE , IntegerDigits = not jobproperties.Digitization.PileUpPremixing() , UseCoolPedestal = False , UseCoolPulseShapes = True , TileCondToolPulseShape = TileCondToolMuRcvPulseShape - , TileRawChannelBuilderMF = TileMuRcvRawChannelBuilderMF) + , TileRawChannelBuilderMF = TileMuRcvRawChannelBuilderMF + , TileCondToolNoiseSample = TileCondToolNoiseSample (TileOnlineSampleNoise = '')) if jobproperties.Digitization.PileUpPremixing and 'OverlayMT' in jobproperties.Digitization.experimentalDigi(): from OverlayCommonAlgs.OverlayFlags import overlayFlags topSequence.TilePulseForTileMuonReceiver.MuonReceiverDigitsContainer = overlayFlags.bkgPrefix() + "MuRcvDigitsCnt"