From 92974e0b69cc3c81a862b44a5b09cd75631406e1 Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Fri, 12 Aug 2022 14:18:01 +0200
Subject: [PATCH] Rename legacy Digitization, SubdetectorEnvelopes and
 TrackRecordGenerator configuration modules

Rename legacy Digitization, SubdetectorEnvelopes and TrackRecordGenerator configuration modules
---
 .../python/SubDetectorEnvelopesConfigDb.py    |  2 +-
 ...py => SubDetectorEnvelopesConfigLegacy.py} |  0
 .../python/TrackRecordGeneratorConfigDb.py    |  4 +-
 ...py => TrackRecordGeneratorConfigLegacy.py} |  0
 ...igiAlgConfig.py => DigiAlgConfigLegacy.py} |  0
 .../python/DigitizationConfigDb.py            | 64 +++++++++----------
 ...{PileUpConfig.py => PileUpConfigLegacy.py} |  0
 ...onfig.py => PileUpMergeSvcConfigLegacy.py} |  0
 8 files changed, 35 insertions(+), 35 deletions(-)
 rename AtlasGeometryCommon/SubDetectorEnvelopes/python/{SubDetectorEnvelopesConfig.py => SubDetectorEnvelopesConfigLegacy.py} (100%)
 rename Generators/TrackRecordGenerator/python/{TrackRecordGeneratorConfig.py => TrackRecordGeneratorConfigLegacy.py} (100%)
 rename Simulation/Digitization/python/{DigiAlgConfig.py => DigiAlgConfigLegacy.py} (100%)
 rename Simulation/Digitization/python/{PileUpConfig.py => PileUpConfigLegacy.py} (100%)
 rename Simulation/Digitization/python/{PileUpMergeSvcConfig.py => PileUpMergeSvcConfigLegacy.py} (100%)

diff --git a/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigDb.py b/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigDb.py
index 1cd1d7567350..97bd3c98dff3 100644
--- a/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigDb.py
+++ b/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigDb.py
@@ -8,4 +8,4 @@ Elmar Ritsch, 27/09/2013
 from AthenaCommon.CfgGetter import addService
 
 # Common tools, services and algorithms used by jobs:
-addService("SubDetectorEnvelopes.SubDetectorEnvelopesConfig.getEnvelopeDefSvc", "AtlasGeometry_EnvelopeDefSvc")
+addService("SubDetectorEnvelopes.SubDetectorEnvelopesConfigLegacy.getEnvelopeDefSvc", "AtlasGeometry_EnvelopeDefSvc")
diff --git a/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfig.py b/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigLegacy.py
similarity index 100%
rename from AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfig.py
rename to AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigLegacy.py
diff --git a/Generators/TrackRecordGenerator/python/TrackRecordGeneratorConfigDb.py b/Generators/TrackRecordGenerator/python/TrackRecordGeneratorConfigDb.py
index a7e3cfafcdcd..df768ca731a9 100644
--- a/Generators/TrackRecordGenerator/python/TrackRecordGeneratorConfigDb.py
+++ b/Generators/TrackRecordGenerator/python/TrackRecordGeneratorConfigDb.py
@@ -2,5 +2,5 @@
 
 from AthenaCommon.CfgGetter import addAlgorithm
 
-addAlgorithm("TrackRecordGenerator.TrackRecordGeneratorConfig.getInput_TrackRecordGenerator", "TrackRecordGenerator")
-addAlgorithm("TrackRecordGenerator.TrackRecordGeneratorConfig.getTrackRecordCosmicGenerator", "TrackRecordCosmicGenerator")
+addAlgorithm("TrackRecordGenerator.TrackRecordGeneratorConfigLegacy.getInput_TrackRecordGenerator", "TrackRecordGenerator")
+addAlgorithm("TrackRecordGenerator.TrackRecordGeneratorConfigLegacy.getTrackRecordCosmicGenerator", "TrackRecordCosmicGenerator")
diff --git a/Generators/TrackRecordGenerator/python/TrackRecordGeneratorConfig.py b/Generators/TrackRecordGenerator/python/TrackRecordGeneratorConfigLegacy.py
similarity index 100%
rename from Generators/TrackRecordGenerator/python/TrackRecordGeneratorConfig.py
rename to Generators/TrackRecordGenerator/python/TrackRecordGeneratorConfigLegacy.py
diff --git a/Simulation/Digitization/python/DigiAlgConfig.py b/Simulation/Digitization/python/DigiAlgConfigLegacy.py
similarity index 100%
rename from Simulation/Digitization/python/DigiAlgConfig.py
rename to Simulation/Digitization/python/DigiAlgConfigLegacy.py
diff --git a/Simulation/Digitization/python/DigitizationConfigDb.py b/Simulation/Digitization/python/DigitizationConfigDb.py
index b2a5f43cf033..663fd46307da 100644
--- a/Simulation/Digitization/python/DigitizationConfigDb.py
+++ b/Simulation/Digitization/python/DigitizationConfigDb.py
@@ -1,41 +1,41 @@
 # Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon.CfgGetter import addTool, addService, addAlgorithm
-addService("Digitization.PileUpConfig.getStepArrayBM"                , "StepArrayBM")
-addService("Digitization.PileUpConfig.getFixedArrayBM"               , "FixedArrayBM")
-addService("Digitization.PileUpConfig.getArrayBM"                    , "ArrayBM")
+addService("Digitization.PileUpConfigLegacy.getStepArrayBM"                , "StepArrayBM")
+addService("Digitization.PileUpConfigLegacy.getFixedArrayBM"               , "FixedArrayBM")
+addService("Digitization.PileUpConfigLegacy.getArrayBM"                    , "ArrayBM")
 
-addService("Digitization.PileUpConfig.getLowPtMinBiasEventSelector"  , "LowPtMinBiasEventSelector")
-addService("Digitization.PileUpConfig.getHighPtMinBiasEventSelector" , "HighPtMinBiasEventSelector")
-addService("Digitization.PileUpConfig.getcavernEventSelector"        , "cavernEventSelector")
-addService("Digitization.PileUpConfig.getBeamGasEventSelector"       , "BeamGasEventSelector")
-addService("Digitization.PileUpConfig.getBeamHaloEventSelector"      , "BeamHaloEventSelector")
+addService("Digitization.PileUpConfigLegacy.getLowPtMinBiasEventSelector"  , "LowPtMinBiasEventSelector")
+addService("Digitization.PileUpConfigLegacy.getHighPtMinBiasEventSelector" , "HighPtMinBiasEventSelector")
+addService("Digitization.PileUpConfigLegacy.getcavernEventSelector"        , "cavernEventSelector")
+addService("Digitization.PileUpConfigLegacy.getBeamGasEventSelector"       , "BeamGasEventSelector")
+addService("Digitization.PileUpConfigLegacy.getBeamHaloEventSelector"      , "BeamHaloEventSelector")
 
-addTool("Digitization.PileUpConfig.getMinBiasCache"                  , "MinBiasCache")
-addTool("Digitization.PileUpConfig.getLowPtMinBiasCache"             , "LowPtMinBiasCache")
-addTool("Digitization.PileUpConfig.getHighPtMinBiasCache"            , "HighPtMinBiasCache")
-addTool("Digitization.PileUpConfig.getCavernCache"                   , "CavernCache")
-addTool("Digitization.PileUpConfig.getBeamGasCache"                  , "BeamGasCache")
-addTool("Digitization.PileUpConfig.getBeamHaloCache"                 , "BeamHaloCache")
+addTool("Digitization.PileUpConfigLegacy.getMinBiasCache"                  , "MinBiasCache")
+addTool("Digitization.PileUpConfigLegacy.getLowPtMinBiasCache"             , "LowPtMinBiasCache")
+addTool("Digitization.PileUpConfigLegacy.getHighPtMinBiasCache"            , "HighPtMinBiasCache")
+addTool("Digitization.PileUpConfigLegacy.getCavernCache"                   , "CavernCache")
+addTool("Digitization.PileUpConfigLegacy.getBeamGasCache"                  , "BeamGasCache")
+addTool("Digitization.PileUpConfigLegacy.getBeamHaloCache"                 , "BeamHaloCache")
 
-addTool("Digitization.DigiAlgConfig.getTestPileUpTool"               , "TestPileUpTool")
-addTool("Digitization.DigiAlgConfig.getTestFilterPileUpTool"         , "TestFilterPileUpTool")
+addTool("Digitization.DigiAlgConfigLegacy.getTestPileUpTool"               , "TestPileUpTool")
+addTool("Digitization.DigiAlgConfigLegacy.getTestFilterPileUpTool"         , "TestFilterPileUpTool")
 
-addService("Digitization.PileUpConfig.getPileUpEventLoopMgr"         , "PileUpEventLoopMgr")
+addService("Digitization.PileUpConfigLegacy.getPileUpEventLoopMgr"         , "PileUpEventLoopMgr")
 
-addAlgorithm("Digitization.DigiAlgConfig.getStandardPileUpToolsAlg"  , "StandardPileUpToolsAlg")
-addAlgorithm("Digitization.DigiAlgConfig.getFastPileUpToolsAlg"      , "FastPileUpToolsAlg")
-addAlgorithm("Digitization.DigiAlgConfig.getSplitPileUpToolsAlg"     , "SplitPileUpToolsAlg")
-addAlgorithm("Digitization.DigiAlgConfig.getSplitSFPileUpToolsAlg"  , "SplitSFPileUpToolsAlg")
-addAlgorithm("Digitization.DigiAlgConfig.getStandardSignalOnlyTruthPileUpToolsAlg"  , "StandardSignalOnlyTruthPileUpToolsAlg")
-addAlgorithm("Digitization.DigiAlgConfig.getStandardInTimeOnlyTruthPileUpToolsAlg"  , "StandardInTimeOnlyTruthPileUpToolsAlg")
-addAlgorithm("Digitization.DigiAlgConfig.getStandardInTimeOnlyGeantinoTruthPileUpToolsAlg"  , "StandardInTimeOnlyGeantinoTruthPileUpToolsAlg")
-addAlgorithm("Digitization.DigiAlgConfig.getSplitNoMergePileUpToolsAlg"  , "SplitNoMergePileUpToolsAlg")
-addAlgorithm("Digitization.DigiAlgConfig.getSplitNoMergeSFPileUpToolsAlg"  , "SplitNoMergeSFPileUpToolsAlg")
-addAlgorithm("Digitization.DigiAlgConfig.getSplitNoMergeFSPileUpToolsAlg"  , "SplitNoMergeFSPileUpToolsAlg")
-addAlgorithm("Digitization.DigiAlgConfig.getSplitNoMergeFFPileUpToolsAlg"  , "SplitNoMergeFFPileUpToolsAlg")
-addAlgorithm("Digitization.DigiAlgConfig.getTestPileUpToolsAlg"      , "TestPileUpToolsAlg")
-addAlgorithm("Digitization.DigiAlgConfig.getTestFilterPileUpToolsAlg"      , "TestFilterPileUpToolsAlg")
-addAlgorithm("Digitization.DigiAlgConfig.getTestTruthJetFilterPileUpToolsAlg" , "TestTruthJetFilterPileUpToolsAlg")
+addAlgorithm("Digitization.DigiAlgConfigLegacy.getStandardPileUpToolsAlg"  , "StandardPileUpToolsAlg")
+addAlgorithm("Digitization.DigiAlgConfigLegacy.getFastPileUpToolsAlg"      , "FastPileUpToolsAlg")
+addAlgorithm("Digitization.DigiAlgConfigLegacy.getSplitPileUpToolsAlg"     , "SplitPileUpToolsAlg")
+addAlgorithm("Digitization.DigiAlgConfigLegacy.getSplitSFPileUpToolsAlg"  , "SplitSFPileUpToolsAlg")
+addAlgorithm("Digitization.DigiAlgConfigLegacy.getStandardSignalOnlyTruthPileUpToolsAlg"  , "StandardSignalOnlyTruthPileUpToolsAlg")
+addAlgorithm("Digitization.DigiAlgConfigLegacy.getStandardInTimeOnlyTruthPileUpToolsAlg"  , "StandardInTimeOnlyTruthPileUpToolsAlg")
+addAlgorithm("Digitization.DigiAlgConfigLegacy.getStandardInTimeOnlyGeantinoTruthPileUpToolsAlg"  , "StandardInTimeOnlyGeantinoTruthPileUpToolsAlg")
+addAlgorithm("Digitization.DigiAlgConfigLegacy.getSplitNoMergePileUpToolsAlg"  , "SplitNoMergePileUpToolsAlg")
+addAlgorithm("Digitization.DigiAlgConfigLegacy.getSplitNoMergeSFPileUpToolsAlg"  , "SplitNoMergeSFPileUpToolsAlg")
+addAlgorithm("Digitization.DigiAlgConfigLegacy.getSplitNoMergeFSPileUpToolsAlg"  , "SplitNoMergeFSPileUpToolsAlg")
+addAlgorithm("Digitization.DigiAlgConfigLegacy.getSplitNoMergeFFPileUpToolsAlg"  , "SplitNoMergeFFPileUpToolsAlg")
+addAlgorithm("Digitization.DigiAlgConfigLegacy.getTestPileUpToolsAlg"      , "TestPileUpToolsAlg")
+addAlgorithm("Digitization.DigiAlgConfigLegacy.getTestFilterPileUpToolsAlg"      , "TestFilterPileUpToolsAlg")
+addAlgorithm("Digitization.DigiAlgConfigLegacy.getTestTruthJetFilterPileUpToolsAlg" , "TestTruthJetFilterPileUpToolsAlg")
 
-addService("Digitization.PileUpMergeSvcConfig.getPileUpMergeSvc"     , "PileUpMergeSvc")
+addService("Digitization.PileUpMergeSvcConfigLegacy.getPileUpMergeSvc"     , "PileUpMergeSvc")
diff --git a/Simulation/Digitization/python/PileUpConfig.py b/Simulation/Digitization/python/PileUpConfigLegacy.py
similarity index 100%
rename from Simulation/Digitization/python/PileUpConfig.py
rename to Simulation/Digitization/python/PileUpConfigLegacy.py
diff --git a/Simulation/Digitization/python/PileUpMergeSvcConfig.py b/Simulation/Digitization/python/PileUpMergeSvcConfigLegacy.py
similarity index 100%
rename from Simulation/Digitization/python/PileUpMergeSvcConfig.py
rename to Simulation/Digitization/python/PileUpMergeSvcConfigLegacy.py
-- 
GitLab