From 6122c949b1cf39d70c1b7f54c23e39357400b39a Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Thu, 7 Mar 2024 15:34:32 +0100
Subject: [PATCH] Move RngComps.RandomServices module to
RngComps.RngCompsConfig - standardising naming
---
.../python/{RandomServices.py => RngCompsConfig.py} | 0
Control/RngComps/test/RandomServices_test.py | 2 +-
.../AFP_Digitization/python/AFP_DigitizationConfig.py | 2 +-
.../python/ALFA_DigitizationConfig.py | 2 +-
.../python/LUCID_DigitizationConfig.py | 2 +-
.../python/ZDC_SimuDigitizationConfig.py | 2 +-
.../CosmicGenerator/python/CosmicGeneratorConfig.py | 2 +-
.../python/TrackRecordGeneratorConfig.py | 2 +-
.../python/HGTD_DigitizationConfig.py | 2 +-
.../python/ITkPixelConditionsConfig.py | 2 +-
.../python/PixelConditionsConfig.py | 2 +-
.../BCM_Digitization/python/BCM_DigitizationConfig.py | 2 +-
.../python/FastSiDigitizationConfig.py | 4 ++--
.../python/FastTRT_DigitizationConfig.py | 2 +-
.../python/ITkPixelDigitizationConfig.py | 2 +-
.../PixelDigitization/python/PLR_DigitizationConfig.py | 2 +-
.../python/PixelDigitizationConfig.py | 4 ++--
.../SCT_Digitization/python/SCT_DigitizationConfig.py | 2 +-
.../TRT_Digitization/python/TRT_DigitizationConfig.py | 2 +-
.../InDetOverlay/python/TRTOverlayConfig.py | 2 +-
.../LArDigitization/python/LArDigitizationConfig.py | 2 +-
.../MuonCondTest/python/TgcDigiJitterTester.py | 2 +-
.../MuonConfig/python/MDT_DigitizationConfig.py | 2 +-
.../MuonConfig/python/MM_DigitizationConfig.py | 4 ++--
.../MuonConfig/python/MuonByteStreamCnvTestConfig.py | 2 +-
.../MuonConfig/python/MuonCalibrationConfig.py | 2 +-
.../MuonConfig/python/RPC_DigitizationConfig.py | 2 +-
.../MuonConfig/python/TGC_DigitizationConfig.py | 4 ++--
.../MuonConfig/python/sTGC_DigitizationConfig.py | 4 ++--
.../xAODMuonSimHitCnv/python/MuonSimHitCnvCfg.py | 10 +++++-----
Simulation/BeamEffects/python/BeamEffectsAlgConfig.py | 2 +-
.../DigitizationConfig/python/PileUpConfig.py | 2 +-
.../FastCaloSim/python/FastCaloSimFactoryNew.py | 2 +-
.../G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfig.py | 2 +-
.../python/ISF_FastCaloSimServicesConfig.py | 2 +-
.../ISF_FatrasServices/python/ISF_FatrasConfig.py | 2 +-
.../ISF_Geant4Tools/python/ISF_Geant4ToolsConfig.py | 2 +-
.../python/TileCellBuilderFromHitTestConfig.py | 2 +-
.../TileRecUtils/python/TileDQstatusToolTestConfig.py | 2 +-
.../TileSimAlgs/python/TileDigitsMakerConfig.py | 2 +-
.../TileSimAlgs/python/TileHitToTTL1Config.py | 2 +-
.../TileSimAlgs/python/TileHitVecToCntConfig.py | 2 +-
.../TileSimAlgs/python/TileMuonReceiverConfig.py | 2 +-
43 files changed, 51 insertions(+), 51 deletions(-)
rename Control/RngComps/python/{RandomServices.py => RngCompsConfig.py} (100%)
diff --git a/Control/RngComps/python/RandomServices.py b/Control/RngComps/python/RngCompsConfig.py
similarity index 100%
rename from Control/RngComps/python/RandomServices.py
rename to Control/RngComps/python/RngCompsConfig.py
diff --git a/Control/RngComps/test/RandomServices_test.py b/Control/RngComps/test/RandomServices_test.py
index c9963d06e47..e86e0fb5837 100755
--- a/Control/RngComps/test/RandomServices_test.py
+++ b/Control/RngComps/test/RandomServices_test.py
@@ -5,7 +5,7 @@ Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
"""
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
-from RngComps.RandomServices import dSFMT, Ranlux64, Ranecu, RNG
+from RngComps.RngCompsConfig import dSFMT, Ranlux64, Ranecu, RNG
# Set up logging and new style config
log.setLevel(DEBUG)
diff --git a/ForwardDetectors/AFP/AFP_Digitization/python/AFP_DigitizationConfig.py b/ForwardDetectors/AFP/AFP_Digitization/python/AFP_DigitizationConfig.py
index 15fd3a87a49..63a5dd1932c 100644
--- a/ForwardDetectors/AFP/AFP_Digitization/python/AFP_DigitizationConfig.py
+++ b/ForwardDetectors/AFP/AFP_Digitization/python/AFP_DigitizationConfig.py
@@ -56,7 +56,7 @@ def AFP_DigitizationToolCfg(flags, name="AFP_PileUpTool", **kwargs):
kwargs.setdefault("mergeSvc", '')
kwargs.setdefault("OnlyUseContainerName", False)
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
acc.setPrivateTools(CompFactory.AFP_PileUpTool(name, **kwargs))
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/python/ALFA_DigitizationConfig.py b/ForwardDetectors/ALFA/ALFA_Digitization/python/ALFA_DigitizationConfig.py
index 987d38638bd..f08f45e9fa0 100644
--- a/ForwardDetectors/ALFA/ALFA_Digitization/python/ALFA_DigitizationConfig.py
+++ b/ForwardDetectors/ALFA/ALFA_Digitization/python/ALFA_DigitizationConfig.py
@@ -48,7 +48,7 @@ def ALFA_PileUpToolCfg(flags, name="ALFA_PileUpTool", **kwargs):
kwargs.setdefault("mergeSvc", '')
#kwargs.setdefault("OnlyUseContainerName", False) #TODO in future MR
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
acc.setPrivateTools(CompFactory.ALFA_PileUpTool(name, **kwargs))
diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/python/LUCID_DigitizationConfig.py b/ForwardDetectors/LUCID/LUCID_Digitization/python/LUCID_DigitizationConfig.py
index 1af4d12cfad..afd478ab43a 100644
--- a/ForwardDetectors/LUCID/LUCID_Digitization/python/LUCID_DigitizationConfig.py
+++ b/ForwardDetectors/LUCID/LUCID_Digitization/python/LUCID_DigitizationConfig.py
@@ -44,7 +44,7 @@ def LUCID_PileUpToolCfg(flags, name="LUCID_PileUpTool",**kwargs):
kwargs.setdefault("mergeSvc", '')
#kwargs.setdefault("OnlyUseContainerName", False) # FIXME in future MR
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
kwargs.setdefault('pmtSmearing', [0.317, 0.000, 0.292, 0.316, 0.208, 0.178, 0.204, 0.281, 0.233, 0.261, 0.223, 0.250, 0.254, 0.239, 0.202, 0.224, 1, 1, 1, 1,
diff --git a/ForwardDetectors/ZDC/ZDC_SimuDigitization/python/ZDC_SimuDigitizationConfig.py b/ForwardDetectors/ZDC/ZDC_SimuDigitization/python/ZDC_SimuDigitizationConfig.py
index b0cf6596bc6..de1ff6134c6 100644
--- a/ForwardDetectors/ZDC/ZDC_SimuDigitization/python/ZDC_SimuDigitizationConfig.py
+++ b/ForwardDetectors/ZDC/ZDC_SimuDigitization/python/ZDC_SimuDigitizationConfig.py
@@ -47,7 +47,7 @@ def ZDC_PileUpToolCfg(flags, name="ZDC_PileUpTool",**kwargs):
kwargs.setdefault("mergeSvc", '')
#kwargs.setdefault("OnlyUseContainerName", False) #TODO in future MR
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
config = "PbPb2023"
diff --git a/Generators/CosmicGenerator/python/CosmicGeneratorConfig.py b/Generators/CosmicGenerator/python/CosmicGeneratorConfig.py
index ede91e659f4..c578e4b12a2 100644
--- a/Generators/CosmicGenerator/python/CosmicGeneratorConfig.py
+++ b/Generators/CosmicGenerator/python/CosmicGeneratorConfig.py
@@ -150,7 +150,7 @@ def CosmicGeneratorCfg(flags, name="CosmicGenerator", **kwargs):
result.addService(CompFactory.PartPropSvc(InputFile="PDGTABLE.MeV"))
## Set up random seeds FIXME
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault('RndmSvc', result.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
from CosmicGenerator.CosmicGeneratorConfig import CavernPropertyCalculator
diff --git a/Generators/TrackRecordGenerator/python/TrackRecordGeneratorConfig.py b/Generators/TrackRecordGenerator/python/TrackRecordGeneratorConfig.py
index 58739cb7818..fb46573be08 100644
--- a/Generators/TrackRecordGenerator/python/TrackRecordGeneratorConfig.py
+++ b/Generators/TrackRecordGenerator/python/TrackRecordGeneratorConfig.py
@@ -24,7 +24,7 @@ def Input_TrackRecordGeneratorCfg(ConfigFlags,name="TrackRecordGenerator", **kwa
kwargs.setdefault('StopParticles', False) # Stop the particles or not
kwargs.setdefault('stopped_tminus', -25.) # in ns, lower bound
kwargs.setdefault('stopped_tplus', 25.) # in ns, upper bound
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault('RndmSvc', acc.getPrimaryAndMerge(AthRNGSvcCfg(ConfigFlags)).name)
#kwargs.setdefault('OutputLevel', DEBUG) # for turning up output during testing
acc.addEventAlgo(TrackRecordGenerator(name,**kwargs))
diff --git a/HighGranularityTimingDetector/HGTD_Digitization/HGTD_Digitization/python/HGTD_DigitizationConfig.py b/HighGranularityTimingDetector/HGTD_Digitization/HGTD_Digitization/python/HGTD_DigitizationConfig.py
index 3f107ddcd65..aca793dc787 100644
--- a/HighGranularityTimingDetector/HGTD_Digitization/HGTD_Digitization/python/HGTD_DigitizationConfig.py
+++ b/HighGranularityTimingDetector/HGTD_Digitization/HGTD_Digitization/python/HGTD_DigitizationConfig.py
@@ -60,7 +60,7 @@ def HGTD_DigitizationBasicToolCfg(flags, name="HGTD_DigitizationBasicTool", **kw
if flags.Digitization.DoXingByXingPileUp:
kwargs.setdefault("FirstXing", HGTD_FirstXing())
kwargs.setdefault("LastXing", HGTD_LastXing())
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
acc.setPrivateTools(CompFactory.HGTD_DigitizationTool(name, **kwargs))
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py
index 20eeae4a597..5a8d54af8e9 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py
@@ -154,7 +154,7 @@ def ITkPixelDistortionAlgCfg(flags, name="ITkPixelDistortionAlg", **kwargs):
acc.merge(addFoldersSplitOnline(flags,"INDET", "/Indet/Onl/PixelDist", "/Indet/PixelDist", className="DetCondCFloat"))
kwargs.setdefault("ReadKey", "/Indet/PixelDist")
kwargs.setdefault("WriteKey", "ITkPixelDistortionData")
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
acc.addCondAlgo(CompFactory.PixelDistortionAlg(name, **kwargs))
return acc
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
index 493f05ab982..7c4d928cc19 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
@@ -261,7 +261,7 @@ def PixelDistortionAlgCfg(flags, name="PixelDistortionAlg", **kwargs):
acc.merge(addFoldersSplitOnline(flags,"INDET","/Indet/Onl/PixelDist","/Indet/PixelDist",className="DetCondCFloat"))
kwargs.setdefault("ReadKey", "/Indet/PixelDist")
kwargs.setdefault("WriteKey", "PixelDistortionData")
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
acc.addCondAlgo(CompFactory.PixelDistortionAlg(name, **kwargs))
return acc
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfig.py b/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfig.py
index 768c647f3c7..751c7eed58a 100644
--- a/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfig.py
@@ -5,7 +5,7 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.Enums import ProductionStep
-from RngComps.RandomServices import AthRNGSvcCfg
+from RngComps.RngCompsConfig import AthRNGSvcCfg
from PixelGeoModel.PixelGeoModelConfig import PixelReadoutGeometryCfg
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DigitizationConfig.TruthDigitizationOutputConfig import TruthDigitizationOutputCfg
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py b/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py
index 9a2dd34297d..8b58ba3878e 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py
@@ -34,7 +34,7 @@ def commonPixelFastDigitizationCfg(flags, name,**kwargs):
from InDetConfig.SiClusterizationToolConfig import ClusterMakerToolCfg
kwargs.setdefault("ClusterMaker", acc.popToolsAndMerge(ClusterMakerToolCfg(flags)))
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
kwargs.setdefault("RndmEngine", "FastPixelDigitization")
@@ -57,7 +57,7 @@ def commonSCT_FastDigitizationCfg(flags, name,**kwargs):
from InDetConfig.SiClusterizationToolConfig import ClusterMakerToolCfg
kwargs.setdefault("ClusterMaker", acc.popToolsAndMerge(ClusterMakerToolCfg(flags)))
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
kwargs.setdefault("RndmEngine", "FastSCT_Digitization")
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/python/FastTRT_DigitizationConfig.py b/InnerDetector/InDetDigitization/FastTRT_Digitization/python/FastTRT_DigitizationConfig.py
index 5a7ef4df527..5e8ad796b52 100644
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/python/FastTRT_DigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/FastTRT_Digitization/python/FastTRT_DigitizationConfig.py
@@ -36,7 +36,7 @@ def BasicTRTFastDigitizationToolCfg(flags, name, **kwargs):
if flags.Digitization.DoXingByXingPileUp:
kwargs.setdefault("FirstXing", FastTRT_FirstXing())
kwargs.setdefault("LastXing", FastTRT_LastXing())
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
kwargs.setdefault("RandomStreamName", "FastTRTDigitization")
tool = CompFactory.TRTFastDigitizationTool(name,**kwargs)
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/ITkPixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/ITkPixelDigitizationConfig.py
index 18c06a72ebb..83191652dac 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/ITkPixelDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/ITkPixelDigitizationConfig.py
@@ -130,7 +130,7 @@ def ITkPixelDigitizationBasicToolCfg(flags, name="ITkPixelDigitizationBasicTool"
if flags.Digitization.DoXingByXingPileUp:
kwargs.setdefault("FirstXing", ITkPixel_FirstXing(flags))
kwargs.setdefault("LastXing", ITkPixel_LastXing(flags))
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
acc.setPrivateTools(CompFactory.PixelDigitizationTool(name, **kwargs))
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PLR_DigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PLR_DigitizationConfig.py
index 53cedf67b17..34fdfb29446 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PLR_DigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PLR_DigitizationConfig.py
@@ -113,7 +113,7 @@ def PLR_DigitizationBasicToolCfg(flags, name="PLR_DigitizationBasicTool", **kwar
if flags.Digitization.DoXingByXingPileUp:
kwargs.setdefault("FirstXing", PLR_FirstXing(flags))
kwargs.setdefault("LastXing", PLR_LastXing(flags))
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
acc.setPrivateTools(CompFactory.PixelDigitizationTool(name, **kwargs, ))
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
index a59e133a5ba..6ccd4988cc7 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
@@ -179,7 +179,7 @@ def PixelDigitizationBasicToolCfg(flags, name="PixelDigitizationBasicTool", **kw
if flags.Digitization.DoXingByXingPileUp:
kwargs.setdefault("FirstXing", Pixel_FirstXing(flags))
kwargs.setdefault("LastXing", Pixel_LastXing(flags))
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
PixelDigitizationTool = CompFactory.PixelDigitizationTool
@@ -222,7 +222,7 @@ def PixelGeantinoTruthDigitizationToolCfg(flags, name="PixelGeantinoTruthDigitiz
kwargs.setdefault("PileUpMergeSvc", '')
kwargs.setdefault("OnlyUseContainerName", flags.Digitization.PileUp)
kwargs.setdefault("VetoPileUpTruthLinks", False)
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
PixelDigitizationTool = CompFactory.PixelDigitizationTool
acc.setPrivateTools(PixelDigitizationTool(name, **kwargs))
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfig.py b/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfig.py
index 3eae5e2a0ce..152e88a38e8 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfig.py
@@ -42,7 +42,7 @@ def SCT_DigitizationCommonCfg(flags, name="SCT_DigitizationToolCommon", **kwargs
if flags.Digitization.DoXingByXingPileUp:
kwargs.setdefault("FirstXing", SCT_FirstXing())
kwargs.setdefault("LastXing", SCT_LastXing() )
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
SCT_DigitizationTool = CompFactory.SCT_DigitizationTool
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfig.py b/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfig.py
index 6e69fce28bb..f8e4aa25b10 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfig.py
@@ -62,7 +62,7 @@ def TRT_DigitizationBasicToolCfg(flags, name="TRT_DigitizationBasicTool", **kwar
if flags.Digitization.DoXingByXingPileUp:
kwargs.setdefault("FirstXing", TRT_FirstXing())
kwargs.setdefault("LastXing", TRT_LastXing())
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
TRTDigitizationTool = CompFactory.TRTDigitizationTool
tool = TRTDigitizationTool(name, **kwargs)
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/python/TRTOverlayConfig.py b/InnerDetector/InDetRawAlgs/InDetOverlay/python/TRTOverlayConfig.py
index 0b37eeb1bce..0979e2bf9d1 100644
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/python/TRTOverlayConfig.py
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/python/TRTOverlayConfig.py
@@ -47,7 +47,7 @@ def TRTOverlayAlgCfg(flags, name="TRTOverlay", **kwargs):
from InDetConfig.TRT_ElectronPidToolsConfig import TRT_OverlayLocalOccupancyCfg
kwargs.setdefault("TRT_LocalOccupancyTool", acc.popToolsAndMerge(TRT_OverlayLocalOccupancyCfg(flags)))
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
# Do TRT overlay
diff --git a/LArCalorimeter/LArDigitization/python/LArDigitizationConfig.py b/LArCalorimeter/LArDigitization/python/LArDigitizationConfig.py
index 61f8812d61f..615dc1f360b 100644
--- a/LArCalorimeter/LArDigitization/python/LArDigitizationConfig.py
+++ b/LArCalorimeter/LArDigitization/python/LArDigitizationConfig.py
@@ -329,7 +329,7 @@ def LArSCL1MakerCfg(flags, **kwargs):
acc.merge(LArAutoCorrNoiseCondSCAlgCfg(flags))
kwargs.setdefault("LArAutoCorrKey", "ConditionStore+LArAutoCorrNoiseSC") # Provided by LArAutoCorrNoiseCondAlg/LArAutoCorrNoiseSCCondAlg
kwargs.setdefault("NSamples", flags.LAr.ROD.nSamples + 2) # For consistency with LArAutoCorrNoiseSC - see ATLASSIM-5483
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc",
acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
if flags.Common.ProductionStep == ProductionStep.PileUpPresampling:
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/TgcDigiJitterTester.py b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/TgcDigiJitterTester.py
index 48d270447f7..8007ecf9d9e 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/TgcDigiJitterTester.py
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/TgcDigiJitterTester.py
@@ -4,7 +4,7 @@ def TgcDigtJitterTestAlgCfg(flags, name="TgcCondDbTestAlg", **kwargs):
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
result = ComponentAccumulator()
from AthenaConfiguration.ComponentFactory import CompFactory
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", result.getPrimaryAndMerge(AthRNGSvcCfg(flags)))
the_alg = CompFactory.TgcDigtJitterTestAlg(name, **kwargs)
result.addEventAlgo(the_alg, primary = True)
diff --git a/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py
index 77b2d202478..c23ff6d5fe2 100644
--- a/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py
@@ -69,7 +69,7 @@ def MDT_DigitizationToolCommonCfg(flags, name="MdtDigitizationTool", **kwargs):
if flags.Digitization.DoXingByXingPileUp:
kwargs.setdefault("FirstXing", MDT_FirstXing())
kwargs.setdefault("LastXing", MDT_LastXing())
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
MdtDigitizationTool = CompFactory.MdtDigitizationTool
acc.setPrivateTools(MdtDigitizationTool(name, **kwargs))
diff --git a/MuonSpectrometer/MuonConfig/python/MM_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/MM_DigitizationConfig.py
index 99fdd1cd9bd..f82405b6ea0 100644
--- a/MuonSpectrometer/MuonConfig/python/MM_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MM_DigitizationConfig.py
@@ -63,7 +63,7 @@ def MM_DigitizationToolCfg(flags, name="MM_DigitizationTool", **kwargs):
kwargs.setdefault("OutputSDOName", flags.Overlay.BkgPrefix + "MM_SDO")
else:
kwargs.setdefault("OutputSDOName", "MM_SDO")
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", result.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
result.setPrivateTools(CompFactory.MM_DigitizationTool(name, **kwargs))
return result
@@ -85,7 +85,7 @@ def MM_OverlayDigitizationToolCfg(flags, name="MM_OverlayDigitizationTool", **kw
kwargs.setdefault("InputObjectName", "MM_Hits")
kwargs.setdefault("OutputObjectName", flags.Overlay.SigPrefix + "MM_DIGITS")
kwargs.setdefault("OutputSDOName", flags.Overlay.SigPrefix + "MM_SDO")
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
acc.setPrivateTools(CompFactory.MM_DigitizationTool(name, **kwargs))
return acc
diff --git a/MuonSpectrometer/MuonConfig/python/MuonByteStreamCnvTestConfig.py b/MuonSpectrometer/MuonConfig/python/MuonByteStreamCnvTestConfig.py
index 3ab6d40aafc..991d22eba0d 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonByteStreamCnvTestConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonByteStreamCnvTestConfig.py
@@ -197,7 +197,7 @@ def CscDigitToCscRDOToolCfg(flags, name="CscDigitToCscRDOTool", **kwargs):
else:
kwargs.setdefault("OutputObjectName", "CSCRDO")
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
acc.setPrivateTools(CompFactory.CscDigitToCscRDOTool("CscDigitToCscRDOTool", **kwargs))
return acc
diff --git a/MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py b/MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py
index a223e3343f8..e26bbbe576d 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py
@@ -132,7 +132,7 @@ def MdtCalibDbAlgCfg(flags,name="MdtCalibDbAlg",**kwargs):
kwargs.setdefault("CreateBFieldFunctions", flags.Muon.Calib.correctMdtRtForBField)
kwargs.setdefault("CreateWireSagFunctions", flags.Muon.Calib.correctMdtRtWireSag)
kwargs.setdefault("CreateSlewingFunctions", flags.Muon.Calib.correctMdtRtForTimeSlewing)
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("AthRNGSvc", result.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
kwargs.setdefault("UseR4DetMgr", flags.Muon.usePhaseIIGeoSetup)
diff --git a/MuonSpectrometer/MuonConfig/python/RPC_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/RPC_DigitizationConfig.py
index e027df3548b..a85524375f6 100644
--- a/MuonSpectrometer/MuonConfig/python/RPC_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/RPC_DigitizationConfig.py
@@ -77,7 +77,7 @@ def RPC_DigitizationToolCommonCfg(flags, name="RpcDigitizationTool", **kwargs):
kwargs.setdefault("FracClusterSize2_C", [0.259986, 0.259986, 0.259986, 0.259986, 0.259986, 0.259986, 0.259986, 0.259986, 0.259986, 0.259986, 0.259986, 0.259986, 0.259986, 0.259986, 0.259986, 0.259986, 0.259986, 0.259986])
kwargs.setdefault("FracClusterSizeTail_C",[0.13035, 0.13035, 0.13035, 0.13035, 0.13035, 0.13035, 0.13035, 0.13035, 0.13035, 0.13035, 0.13035, 0.13035, 0.13035, 0.13035, 0.13035, 0.13035, 0.13035, 0.13035 ])
kwargs.setdefault("MeanClusterSizeTail_C",[0.548598, 0.548598, 0.548598, 0.548598, 0.548598, 0.548598, 0.548598, 0.548598, 0.548598, 0.548598, 0.548598, 0.548598, 0.548598, 0.548598, 0.548598, 0.548598, 0.548598, 0.548598])
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
RpcDigitizationTool = CompFactory.RpcDigitizationTool(name, **kwargs)
acc.setPrivateTools(RpcDigitizationTool)
diff --git a/MuonSpectrometer/MuonConfig/python/TGC_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/TGC_DigitizationConfig.py
index d5fa2383c5c..89c0b955024 100644
--- a/MuonSpectrometer/MuonConfig/python/TGC_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/TGC_DigitizationConfig.py
@@ -66,7 +66,7 @@ def TGC_DigitizationToolCfg(flags, name="TgcDigitizationTool", **kwargs):
if flags.GeoModel.Run < LHCPeriod.Run3:
kwargs.setdefault("FourBunchDigitization", False)
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
TgcDigitizationTool = CompFactory.TgcDigitizationTool
@@ -91,7 +91,7 @@ def TGC_OverlayDigitizationToolCfg(flags, name="Tgc_OverlayDigitizationTool", **
if flags.GeoModel.Run < LHCPeriod.Run3:
kwargs.setdefault("FourBunchDigitization", False)
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
kwargs.setdefault("PileUpMergeSvc", '')
TgcDigitizationTool = CompFactory.TgcDigitizationTool
diff --git a/MuonSpectrometer/MuonConfig/python/sTGC_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/sTGC_DigitizationConfig.py
index 81f008b7465..e8281548e9d 100644
--- a/MuonSpectrometer/MuonConfig/python/sTGC_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/sTGC_DigitizationConfig.py
@@ -69,7 +69,7 @@ def sTGC_DigitizationToolCfg(flags, name="sTgcDigitizationTool", **kwargs):
else:
kwargs.setdefault("InputObjectName", "sTGC_Hits")
kwargs.setdefault("OutputObjectName", "sTGC_DIGITS")
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", result.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
if flags.Common.ProductionStep == ProductionStep.PileUpPresampling:
kwargs.setdefault("OutputSDOName", flags.Overlay.BkgPrefix + "sTGC_SDO")
@@ -96,7 +96,7 @@ def sTGC_OverlayDigitizationToolCfg(flags, name="STGC_OverlayDigitizationTool",
kwargs.setdefault("InputObjectName", "sTGC_Hits")
kwargs.setdefault("OutputObjectName", flags.Overlay.SigPrefix + "sTGC_DIGITS")
kwargs.setdefault("OutputSDOName", flags.Overlay.SigPrefix + "sTGC_SDO")
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
sTgcDigitizationTool = CompFactory.sTgcDigitizationTool
acc.setPrivateTools(sTgcDigitizationTool(name, **kwargs))
diff --git a/MuonSpectrometer/MuonPhaseII/MuonCnv/xAODMuonSimHitCnv/python/MuonSimHitCnvCfg.py b/MuonSpectrometer/MuonPhaseII/MuonCnv/xAODMuonSimHitCnv/python/MuonSimHitCnvCfg.py
index 88cee268fd1..9a0e82272b6 100644
--- a/MuonSpectrometer/MuonPhaseII/MuonCnv/xAODMuonSimHitCnv/python/MuonSimHitCnvCfg.py
+++ b/MuonSpectrometer/MuonPhaseII/MuonCnv/xAODMuonSimHitCnv/python/MuonSimHitCnvCfg.py
@@ -23,7 +23,7 @@ def xAODSimHitToMdtMeasCnvAlgCfg(flags,name = "SimHitToMdtMeasurementCnvAlg", **
result.merge(MdtCalibDbAlgCfg(flags))
from MuonStationGeoHelpers.MuonStationGeoHelpersCfg import MuonLaySurfaceToolCfg
kwargs.setdefault("LayerGeoTool", result.getPrimaryAndMerge(MuonLaySurfaceToolCfg(flags)))
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", result.getPrimaryAndMerge(AthRNGSvcCfg(flags)))
from MuonStationGeoHelpers.MuonStationGeoHelpersCfg import MuonLaySurfaceToolCfg
kwargs.setdefault("LayerGeoTool", result.getPrimaryAndMerge(MuonLaySurfaceToolCfg(flags)))
@@ -35,7 +35,7 @@ def xAODSimHitToRpcMeasCnvAlgCfg(flags,name = "SimHitToRpcMeasurementCnvAlg", **
result = ComponentAccumulator()
from MuonStationGeoHelpers.MuonStationGeoHelpersCfg import MuonLaySurfaceToolCfg
kwargs.setdefault("LayerGeoTool", result.getPrimaryAndMerge(MuonLaySurfaceToolCfg(flags)))
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", result.getPrimaryAndMerge(AthRNGSvcCfg(flags)))
from MuonStationGeoHelpers.MuonStationGeoHelpersCfg import MuonLaySurfaceToolCfg
kwargs.setdefault("LayerGeoTool", result.getPrimaryAndMerge(MuonLaySurfaceToolCfg(flags)))
@@ -47,7 +47,7 @@ def xAODSimHitToTgcMeasCnvAlgCfg(flags,name = "SimHitToTgcMeasurementCnvAlg", **
result = ComponentAccumulator()
from MuonStationGeoHelpers.MuonStationGeoHelpersCfg import MuonLaySurfaceToolCfg
kwargs.setdefault("LayerGeoTool", result.getPrimaryAndMerge(MuonLaySurfaceToolCfg(flags)))
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", result.getPrimaryAndMerge(AthRNGSvcCfg(flags)))
from MuonStationGeoHelpers.MuonStationGeoHelpersCfg import MuonLaySurfaceToolCfg
kwargs.setdefault("LayerGeoTool", result.getPrimaryAndMerge(MuonLaySurfaceToolCfg(flags)))
@@ -59,7 +59,7 @@ def xAODSimHitTosTGCMeasCnvAlgCfg(flags, name = "SimHitTosTGCMeasurementCnvAlg",
result = ComponentAccumulator()
from MuonStationGeoHelpers.MuonStationGeoHelpersCfg import MuonLaySurfaceToolCfg
kwargs.setdefault("LayerGeoTool", result.getPrimaryAndMerge(MuonLaySurfaceToolCfg(flags)))
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", result.getPrimaryAndMerge(AthRNGSvcCfg(flags)))
from MuonConfig.MuonCalibrationConfig import NswErrorCalibDbAlgCfg
result.merge(NswErrorCalibDbAlgCfg(flags))
@@ -72,7 +72,7 @@ def xAODSimHitToMmMeasCnvAlgCfg(flags, name = "SimHitToMmMeasurementCnvAlg",**kw
result = ComponentAccumulator()
from MuonStationGeoHelpers.MuonStationGeoHelpersCfg import MuonLaySurfaceToolCfg
kwargs.setdefault("LayerGeoTool", result.getPrimaryAndMerge(MuonLaySurfaceToolCfg(flags)))
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("RndmSvc", result.getPrimaryAndMerge(AthRNGSvcCfg(flags)))
from MuonConfig.MuonCalibrationConfig import NswErrorCalibDbAlgCfg
result.merge(NswErrorCalibDbAlgCfg(flags))
diff --git a/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py b/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
index 422ddeda6da..36ca1614e22 100755
--- a/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
+++ b/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
@@ -58,7 +58,7 @@ def GenEventVertexPositionerCfg(flags, name="GenEventVertexPositioner", **kwargs
# LorentzVectorGenerators
def VertexBeamCondPositionerCfg(flags, name="VertexBeamCondPositioner", **kwargs):
"""Return a conditional (? todo) vertex positioner tool"""
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
acc = ComponentAccumulator()
diff --git a/Simulation/Digitization/DigitizationConfig/python/PileUpConfig.py b/Simulation/Digitization/DigitizationConfig/python/PileUpConfig.py
index 7a5c2f21c6a..f633b3814d3 100644
--- a/Simulation/Digitization/DigitizationConfig/python/PileUpConfig.py
+++ b/Simulation/Digitization/DigitizationConfig/python/PileUpConfig.py
@@ -5,7 +5,7 @@ Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
-from RngComps.RandomServices import dSFMT, AthRNGSvcCfg
+from RngComps.RngCompsConfig import dSFMT, AthRNGSvcCfg
from DigitizationConfig import PileUpEventType
from DigitizationConfig.RunDependentConfig import (
maxNevtsPerXing,
diff --git a/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactoryNew.py b/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactoryNew.py
index c68d2c4b2b7..7f05b0209da 100644
--- a/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactoryNew.py
+++ b/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactoryNew.py
@@ -90,7 +90,7 @@ def NITimedExtrapolatorCfg(flags, name="ISF_NITimedExtrapolator", **kwargs):
# FastShowerCellBuilderTool
def FastShowerCellBuilderToolBaseCfg(flags, name="ISF_FastShowerCellBuilderTool", **kwargs):
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
from IOVDbSvc.IOVDbSvcConfig import addFolders
from ISF_FastCaloSimServices.ISF_FastCaloSimHelpers import AdditionalParticleParametrizationFileNames
diff --git a/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfig.py b/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfig.py
index a8724f74482..6bfecd34fd7 100644
--- a/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfig.py
+++ b/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfig.py
@@ -51,7 +51,7 @@ def G4AtlasAlgCfg(flags, name="G4AtlasAlg", **kwargs):
## default true
kwargs.setdefault("KillAbortedEvents", flags.Sim.KillAbortedEvents)
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs.setdefault("AtRndmGenSvc",
result.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name)
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesConfig.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesConfig.py
index 21a1f0e29b1..bc9874556c8 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesConfig.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesConfig.py
@@ -4,7 +4,7 @@ Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-from RngComps.RandomServices import AthRNGSvcCfg
+from RngComps.RngCompsConfig import AthRNGSvcCfg
from ISF_Services.ISF_ServicesConfig import TruthServiceCfg
from ISF_FastCaloSimParametrization.ISF_FastCaloSimParametrizationConfig import FastCaloSimCaloExtrapolationCfg
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py
index 0188ad9dc77..83dd7234bbe 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py
@@ -11,7 +11,7 @@ from ISF_Services.ISF_ServicesConfig import (
ATLFAST_ParticleBrokerSvcCfg, TruthServiceCfg
)
from ISF_Geant4Tools.ISF_Geant4ToolsConfig import G4RunManagerHelperCfg
-from RngComps.RandomServices import dSFMT, AthRNGSvcCfg
+from RngComps.RngCompsConfig import dSFMT, AthRNGSvcCfg
def TrkExRndSvcCfg(flags):
seed = 'TrkExRnd OFFSET 0 12412330 37849324'
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfig.py b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfig.py
index da56c34dff7..4f3989c7c1d 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfig.py
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfig.py
@@ -4,7 +4,7 @@ Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-from RngComps.RandomServices import AthRNGSvcCfg
+from RngComps.RngCompsConfig import AthRNGSvcCfg
from G4AtlasServices.G4AtlasServicesConfig import (
DetectorGeometrySvcCfg, PhysicsListSvcCfg
)
diff --git a/TileCalorimeter/TileRecUtils/python/TileCellBuilderFromHitTestConfig.py b/TileCalorimeter/TileRecUtils/python/TileCellBuilderFromHitTestConfig.py
index e3ada2db720..25566d1c7ba 100644
--- a/TileCalorimeter/TileRecUtils/python/TileCellBuilderFromHitTestConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileCellBuilderFromHitTestConfig.py
@@ -410,7 +410,7 @@ def TileRawChannelBuilderFromHitTestCfg(flags):
from TileConditions.TileEMScaleConfig import TileEMScaleCondAlgCfg
acc.merge( TileEMScaleCondAlgCfg(flags) )
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
acc.merge( AthRNGSvcCfg(flags) )
from TileConditions.TileSamplingFractionConfig import TileSamplingFractionCondAlgCfg
diff --git a/TileCalorimeter/TileRecUtils/python/TileDQstatusToolTestConfig.py b/TileCalorimeter/TileRecUtils/python/TileDQstatusToolTestConfig.py
index 16cc20dd810..60fb4620e6b 100644
--- a/TileCalorimeter/TileRecUtils/python/TileDQstatusToolTestConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileDQstatusToolTestConfig.py
@@ -501,7 +501,7 @@ def TileDQstatusToolTestCfg(flags):
from TileGeoModel.TileGMConfig import TileGMCfg
acc.merge(TileGMCfg(flags))
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
acc.merge( AthRNGSvcCfg(flags) )
from TileConditions.TileBadChannelsConfig import TileBadChannelsCondAlgCfg
diff --git a/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py b/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py
index 6897ef67a44..66a60a43137 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py
@@ -77,7 +77,7 @@ def TileDigitsMakerCfg(flags, **kwargs):
if tileNoise or tileCoherNoise or kwargs['RndmEvtOverlay']:
if 'RndmSvc' not in kwargs:
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs['RndmSvc'] = acc.getPrimaryAndMerge( AthRNGSvcCfg(flags) ).name
else:
kwargs['RndmSvc'] = None
diff --git a/TileCalorimeter/TileSimAlgs/python/TileHitToTTL1Config.py b/TileCalorimeter/TileSimAlgs/python/TileHitToTTL1Config.py
index 7a5d2288e8c..f862d45a1be 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileHitToTTL1Config.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileHitToTTL1Config.py
@@ -31,7 +31,7 @@ def TileHitToTTL1Cfg(flags, **kwargs):
acc.merge(TileCablingSvcCfg(flags))
if 'RndmSvc' not in kwargs:
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs['RndmSvc'] = acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name
if kwargs['maskBadChannels']:
diff --git a/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py b/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py
index db1ed7fe4e4..7f021e27dd0 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py
@@ -72,7 +72,7 @@ def TileHitVecToCntToolCfg(flags, **kwargs):
kwargs.setdefault('TileHitContainer_DigiHSTruth', '')
if 'RndmSvc' not in kwargs:
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs['RndmSvc'] = acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name
if kwargs['RndmEvtOverlay']:
diff --git a/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py b/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py
index 028856119db..ed732b77fab 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py
@@ -36,7 +36,7 @@ def TilePulseForTileMuonReceiverCfg(flags, **kwargs):
acc.merge( TileSamplingFractionCondAlgCfg(flags) )
if 'RndmSvc' not in kwargs:
- from RngComps.RandomServices import AthRNGSvcCfg
+ from RngComps.RngCompsConfig import AthRNGSvcCfg
kwargs['RndmSvc'] = acc.getPrimaryAndMerge(AthRNGSvcCfg(flags)).name
if kwargs['UseCoolNoise'] or kwargs['UseCoolPedestal']:
--
GitLab