diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
index e042768ce56cbb9041c36b38ebe0a089e783ccbc..b7776c80f57780db82c5f1fb8d4caca35ed14555 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
@@ -244,8 +244,8 @@ def PixelDetectorElementCondAlgCfg(flags, name="PixelDetectorElementCondAlg", **
# conditions algs to ensure that the IOV
# is identical to the IOV of the tracking geometry
if flags.Detector.GeometryMuon and flags.Muon.enableAlignment:
- from MuonConfig.MuonGeometryConfig import MuonDetectorCondAlgCfg
- acc.merge(MuonDetectorCondAlgCfg(flags))
+ from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
+ acc.merge(MuonGeoModelCfg(flags))
kwargs.setdefault("MuonManagerKey", "MuonDetectorManager")
if flags.Detector.GeometryTRT:
from TRT_GeoModel.TRT_GeoModelConfig import TRT_ReadoutGeometryCfg
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsAlgorithmsConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsAlgorithmsConfig.py
index 988da80e0c92f4f91bac2c9652321880d97bfe7c..55a1ee026f4515057b813d518e01166594f2d0ab 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsAlgorithmsConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsAlgorithmsConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from IOVDbSvc.IOVDbSvcConfig import addFoldersSplitOnline
@@ -76,8 +76,8 @@ def SCT_DetectorElementCondAlgCfg(flags, name="SCT_DetectorElementCondAlg", **kw
# conditions algs to ensure that the IOV
# is identical to the IOV of the tracking geometry
if flags.Detector.GeometryMuon and flags.Muon.enableAlignment:
- from MuonConfig.MuonGeometryConfig import MuonDetectorCondAlgCfg
- acc.merge(MuonDetectorCondAlgCfg(flags))
+ from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
+ acc.merge(MuonGeoModelCfg(flags))
kwargs.setdefault("MuonManagerKey", "MuonDetectorManager")
if flags.Detector.GeometryTRT:
from TRT_GeoModel.TRT_GeoModelConfig import TRT_ReadoutGeometryCfg
diff --git a/MuonSpectrometer/MuonConfig/python/CSC_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/CSC_DigitizationConfig.py
index 7fba8188529f3d34f9fc65842e98bfc1c0a03260..bc1007ac37d0c96f3e4da8090a4b5e24db399579 100644
--- a/MuonSpectrometer/MuonConfig/python/CSC_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/CSC_DigitizationConfig.py
@@ -114,7 +114,7 @@ def CSC_DigitizationBasicCfg(flags, **kwargs):
def CSC_OverlayDigitizationBasicCfg(flags, **kwargs):
"""Return ComponentAccumulator with CSC Overlay digitization"""
- acc = MuonGeoModelCfg(flags, forceDisableAlignment=not flags.Overlay.DataOverlay)
+ acc = MuonGeoModelCfg(flags)
acc.merge(CscCondDbAlgCfg(flags))
if flags.Common.ProductionStep != ProductionStep.FastChain:
diff --git a/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py
index f5012e001b8ba4cfc784f9a5d397645913e69db1..a32ef7aa7bbaacbc77dff3a08343e1d38db4438e 100644
--- a/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py
@@ -134,7 +134,7 @@ def MDT_DigitizationBasicCfg(flags, **kwargs):
def MDT_OverlayDigitizationBasicCfg(flags, **kwargs):
"""Return ComponentAccumulator with MDT Overlay digitization"""
- acc = MuonGeoModelCfg(flags, forceDisableAlignment=not flags.Overlay.DataOverlay)
+ acc = MuonGeoModelCfg(flags)
if flags.Common.ProductionStep != ProductionStep.FastChain:
from SGComps.SGInputLoaderConfig import SGInputLoaderCfg
diff --git a/MuonSpectrometer/MuonConfig/python/MM_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/MM_DigitizationConfig.py
index 096e684e80e1775b27540415d0c5c1196a467d8c..1cefe6716adf10afc08ea58d2b8396693146c34a 100644
--- a/MuonSpectrometer/MuonConfig/python/MM_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MM_DigitizationConfig.py
@@ -111,7 +111,7 @@ def MM_DigitizationBasicCfg(flags, **kwargs):
def MM_OverlayDigitizationBasicCfg(flags, **kwargs):
"""Return ComponentAccumulator with MM Overlay digitization"""
- acc = MuonGeoModelCfg(flags, forceDisableAlignment=not flags.Overlay.DataOverlay)
+ acc = MuonGeoModelCfg(flags)
if flags.Common.ProductionStep != ProductionStep.FastChain:
from SGComps.SGInputLoaderConfig import SGInputLoaderCfg
if 'MMSimHitCollection#MicromegasSensitiveDetector' in flags.Input.SecondaryTypedCollections:
diff --git a/MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py b/MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py
index 4e5e786c6b743ed306f313e2930a02083efedc6c..0258326b352b120e52c1e209d3c4e064a5e7564d 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py
@@ -1,9 +1,9 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
# Based on : https://gitlab.cern.ch/atlas/athena/blob/master/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCalibConfig.py
from MuonConfig.MuonCondAlgConfig import CscCondDbAlgCfg, NswCalibDbAlgCfg
-from MuonConfig.MuonGeometryConfig import MuonDetectorCondAlgCfg
+from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.Enums import BeamType, LHCPeriod
@@ -116,7 +116,7 @@ def MdtCalibrationDbToolCfg(flags, **kwargs):
return result
def MdtCalibDbAlgCfg(flags,name="MdtCalibDbAlg",**kwargs):
- result = MuonDetectorCondAlgCfg(flags)
+ result = MuonGeoModelCfg(flags)
# setup COOL folders
acc, mdt_folder_name_appendix = _setupMdtCondDB(flags)
diff --git a/MuonSpectrometer/MuonConfig/python/MuonConfigFlags.py b/MuonSpectrometer/MuonConfig/python/MuonConfigFlags.py
index 315ee5f74b716bd2d70a043017f8ffb0880da0aa..4e0918c8652f7c5d08702ee6a38ee1c91e1c5805 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonConfigFlags.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonConfigFlags.py
@@ -78,7 +78,8 @@ def createMuonConfigFlags():
mcf.addFlag("Muon.runCommissioningChain", lambda prevFlags: ( False and (prevFlags.Detector.EnableMM or prevFlags.Detector.EnablesTGC) \
and prevFlags.Beam.Type is BeamType.Collisions) )
- mcf.addFlag("Muon.applyMMPassivation", lambda prevFlags: prevFlags.GeoModel.Run>=LHCPeriod.Run3 and not prevFlags.Common.isOnline )
+ mcf.addFlag("Muon.applyMMPassivation", lambda prevFlags: prevFlags.GeoModel.Run>=LHCPeriod.Run3 and not prevFlags.Common.isOnline and (prevFlags.Common.Project is not Project.AthSimulation \
+ and (prevFlags.Common.ProductionStep not in [ProductionStep.Simulation, ProductionStep.FastChain] or prevFlags.Overlay.DataOverlay)))
# CalibFlags
mcf.addFlag("Muon.Calib.readMDTCalibFromBlob", True) # Read mdt tube calibration from blob-folders
mcf.addFlag("Muon.Calib.correctMdtRtForBField", lambda prevFlags : (prevFlags.Input.isMC is False and prevFlags.Beam.Type is BeamType.Collisions)) # Apply B-field correction to drift times only for collision data (as done in https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCalibFlags.py#0028)
diff --git a/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py b/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py
index 319c9c9c133c5e5ca7475acea188d83bf07d7ffa..e28138c56bdd00953d72174bda2a84e2fc3474a1 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py
@@ -9,6 +9,7 @@ from AthenaConfiguration.Enums import LHCPeriod
def MuonIdHelperSvcCfg(flags):
acc = ComponentAccumulator()
+ acc.merge(GeoModelCfg(flags))
acc.addService( CompFactory.Muon.MuonIdHelperSvc("MuonIdHelperSvc",
HasCSC=flags.Detector.GeometryCSC,
HasSTGC=flags.Detector.GeometrysTGC,
@@ -18,41 +19,58 @@ def MuonIdHelperSvcCfg(flags):
HasTGC=flags.Detector.GeometryTGC), primary=True )
return acc
+@AccumulatorCache
+def MuonGeoModelCfg(flags):
+ result = ComponentAccumulator()
+ result.merge(MuonIdHelperSvcCfg(flags))
+ if flags.Muon.setupGeoModelXML:
+ from MuonGeoModelR4.MuonGeoModelConfig import MuonGeoModelCfg as MuonGeoModelCfgR4
+ result.merge(MuonGeoModelCfgR4(flags))
+ return result
+
+ result.merge(MuonGeoModelToolCfg(flags))
+ result.merge(MuonDetectorCondAlgCfg(flags))
+ return result
-def MuonDetectorToolCfg(flags):
+
+def MuonDetectorToolCfg(flags, name = "MuonDetectorTool", **kwargs):
acc = ComponentAccumulator()
- detTool = CompFactory.MuonDetectorTool(
- HasCSC=flags.Detector.GeometryCSC,
- HasSTgc=flags.Detector.GeometrysTGC,
- HasMM=flags.Detector.GeometryMM
- )
- detTool.UseConditionDb = 1
- detTool.UseIlinesFromGM = False
+ kwargs.setdefault("HasCSC", flags.Detector.GeometryCSC)
+ kwargs.setdefault("HasSTgc", flags.Detector.GeometrysTGC)
+ kwargs.setdefault("HasMM", flags.Detector.GeometryMM)
+
+
+ kwargs.setdefault("UseConditionDb", flags.Muon.enableAlignment)
+ # call fill cache of MuonDetectorTool such that all MdtReadoutElement caches are filled
+ # already during initialize() -> this will increase memory -> needs to be measured
+ kwargs.setdefault("FillCacheInitTime", flags.Common.ProductionStep != ProductionStep.Simulation or \
+ flags.Muon.enableAlignment)
+
+ kwargs.setdefault("UseAsciiConditionData", flags.Muon.enableAlignment)
+ # turn on/off caching of MdtReadoutElement surfaces
+ kwargs.setdefault("CachingFlag", 1)
+
+ UseIlinesFromGM = False
+ EnableCscInternalAlignment = False
if flags.Muon.enableAlignment:
- # Condition DB is needed only if A-lines or B-lines are requested
- if not (not flags.Muon.Align.UseALines and flags.Muon.Align.UseBLines=='none'):
- detTool.UseConditionDb = 1
-
# here define if I-lines (CSC internal alignment) are enabled
if flags.Muon.Align.UseILines and flags.Detector.GeometryCSC:
if 'HLT' in flags.IOVDb.GlobalTag:
#logMuon.info("Reading CSC I-Lines from layout - special configuration for COMP200 in HLT setup.")
- detTool.UseIlinesFromGM = True
- detTool.EnableCscInternalAlignment = False
+ UseIlinesFromGM = True
+ EnableCscInternalAlignment = False
else :
#logMuon.info("Reading CSC I-Lines from conditions database.")
if (flags.Common.isOnline and not flags.Input.isMC):
- detTool.EnableCscInternalAlignment = True
+ EnableCscInternalAlignment = True
else:
- detTool.UseIlinesFromGM = False
- detTool.EnableCscInternalAlignment = True
- else:
- detTool.UseConditionDb = 0
- detTool.UseAsciiConditionData = 0
- if flags.Common.ProductionStep == ProductionStep.Simulation:
- detTool.FillCacheInitTime = 0
-
+ UseIlinesFromGM = False
+ EnableCscInternalAlignment = True
+
+ kwargs.setdefault("UseIlinesFromGM", UseIlinesFromGM)
+ kwargs.setdefault("EnableCscInternalAlignment", EnableCscInternalAlignment)
+
if not flags.GeoModel.SQLiteDB:
## Additional material in the muon system
AGDD2Geo = CompFactory.AGDDtoGeoSvc()
@@ -67,23 +85,15 @@ def MuonDetectorToolCfg(flags):
#create=True is needed for the service to be initialised in the new style
acc.addService(AGDD2Geo, create=True)
- # call fill cache of MuonDetectorTool such that all MdtReadoutElement caches are filled
- # already during initialize() -> this will increase memory -> needs to be measured
- detTool.FillCacheInitTime = 1
- # turn on/off caching of MdtReadoutElement surfaces
- detTool.CachingFlag = 1
acc.merge(MuonIdHelperSvcCfg(flags))
+
+ detTool = CompFactory.MuonDetectorTool(name, **kwargs)
acc.setPrivateTools(detTool)
return acc
-@AccumulatorCache
def MuonAlignmentCondAlgCfg(flags, name="MuonAlignmentCondAlg", **kwargs):
acc = ComponentAccumulator()
- acc.merge(MuonGeoModelToolCfg(flags))
-
- # This is all migrated from MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonAlignConfig.py
-
from IOVDbSvc.IOVDbSvcConfig import addFolders
MuonAlignmentCondAlg=CompFactory.MuonAlignmentCondAlg
if (flags.Common.isOnline and not flags.Input.isMC):
@@ -102,25 +112,25 @@ def MuonAlignmentCondAlgCfg(flags, name="MuonAlignmentCondAlg", **kwargs):
MuonAlign = MuonAlignmentCondAlg()
- MuonAlign.ParlineFolders = ["/MUONALIGN/MDT/BARREL",
- "/MUONALIGN/MDT/ENDCAP/SIDEA",
- "/MUONALIGN/MDT/ENDCAP/SIDEC",
- "/MUONALIGN/TGC/SIDEA",
- "/MUONALIGN/TGC/SIDEC"]
+ ParlineFolders = ["/MUONALIGN/MDT/BARREL",
+ "/MUONALIGN/MDT/ENDCAP/SIDEA",
+ "/MUONALIGN/MDT/ENDCAP/SIDEC",
+ "/MUONALIGN/TGC/SIDEA",
+ "/MUONALIGN/TGC/SIDEC"]
# here define if I-lines (CSC internal alignment) are enabled
if flags.Muon.Align.UseILines and flags.Detector.GeometryCSC:
if 'HLT' in flags.IOVDb.GlobalTag:
#logMuon.info("Reading CSC I-Lines from layout - special configuration for COMP200 in HLT setup.")
- MuonAlign.ILinesFromCondDB = False
+ kwargs.setdefault("ILinesFromCondDB", False)
else:
#logMuon.info("Reading CSC I-Lines from conditions database.")
if (flags.Common.isOnline and not flags.Input.isMC):
acc.merge(addFolders( flags, ['/MUONALIGN/Onl/CSC/ILINES'], 'MUONALIGN', className='CondAttrListCollection'))
else:
acc.merge(addFolders( flags, ['/MUONALIGN/CSC/ILINES'], 'MUONALIGN_OFL', className='CondAttrListCollection'))
- MuonAlign.ParlineFolders += ["/MUONALIGN/CSC/ILINES"]
- MuonAlign.ILinesFromCondDB = True
+ ParlineFolders += ["/MUONALIGN/CSC/ILINES"]
+ kwargs.setdefault("ILinesFromCondDB", True)
# here define if As-Built (MDT chamber alignment) are enabled
if flags.Muon.Align.UseAsBuilt:
@@ -131,11 +141,12 @@ def MuonAlignmentCondAlgCfg(flags, name="MuonAlignmentCondAlg", **kwargs):
else :
#logMuon.info("Reading As-Built parameters from conditions database")
acc.merge(addFolders( flags, '/MUONALIGN/MDT/ASBUILTPARAMS' , 'MUONALIGN_OFL', className='CondAttrListCollection'))
- MuonAlign.ParlineFolders += ["/MUONALIGN/MDT/ASBUILTPARAMS"]
+ ParlineFolders += ["/MUONALIGN/MDT/ASBUILTPARAMS"]
acc.merge(NswAsBuiltCondAlgCfg(flags))
pass
-
- acc.addCondAlgo(MuonAlign)
+ kwargs.setdefault("ParlineFolders", ParlineFolders)
+ MuonAlign = CompFactory.MuonAlignmentCondAlg(name, **kwargs)
+ acc.addCondAlgo(MuonAlign, primary = True)
return acc
@@ -161,24 +172,24 @@ def NswAsBuiltCondAlgCfg(flags, name = "NswAsBuiltCondAlg", **kwargs):
result.addCondAlgo(the_alg, primary = True)
return result
-
def MuonDetectorCondAlgCfg(flags, name = "MuonDetectorCondAlg", **kwargs):
result = ComponentAccumulator()
- result.merge(MuonAlignmentCondAlgCfg(flags))
+ kwargs.setdefault("MuonDetectorTool", result.popToolsAndMerge(MuonDetectorToolCfg(flags)))
kwargs.setdefault("applyMmPassivation", flags.Muon.applyMMPassivation)
if kwargs["applyMmPassivation"]:
from MuonConfig.MuonCondAlgConfig import NswPassivationDbAlgCfg
result.merge(NswPassivationDbAlgCfg(flags))
-
+ if flags.Muon.enableAlignment:
+ result.merge(MuonAlignmentCondAlgCfg(flags))
kwargs.setdefault("applyALines", len([alg for alg in result.getCondAlgos() if alg.name == "MuonAlignmentCondAlg"])>0)
kwargs.setdefault("applyBLines", len([alg for alg in result.getCondAlgos() if alg.name == "MuonAlignmentCondAlg"])>0)
kwargs.setdefault("applyNswAsBuilt", len([alg for alg in result.getCondAlgos() if alg.name == "NswAsBuiltCondAlg"])>0)
kwargs.setdefault("applyMdtAsBuilt", flags.Muon.Align.UseAsBuilt and not (flags.IOVDb.DatabaseInstance == 'COMP200' or \
'HLT' in flags.IOVDb.GlobalTag or flags.Common.isOnline or flags.Input.isMC))
- kwargs.setdefault("MuonDetectorTool", result.popToolsAndMerge(MuonDetectorToolCfg(flags)))
+
MuonDetectorManagerCond = CompFactory.MuonDetectorCondAlg(name, **kwargs)
@@ -187,24 +198,7 @@ def MuonDetectorCondAlgCfg(flags, name = "MuonDetectorCondAlg", **kwargs):
def MuonGeoModelToolCfg(flags):
- acc = GeoModelCfg(flags)
- gms = acc.getPrimary()
- detTool = acc.popToolsAndMerge(MuonDetectorToolCfg(flags))
- detTool.FillCacheInitTime = 0 # We do not need to fill cache for the MuonGeoModel MuonDetectorTool, just for the condAlg
- gms.DetectorTools += [ detTool ]
- return acc
-
-
-def MuonGeoModelCfg(flags, forceDisableAlignment=False):
- if flags.Muon.setupGeoModelXML:
- from MuonGeoModelR4.MuonGeoModelConfig import MuonGeoModelCfg as MuonGeoModelCfgR4
- return MuonGeoModelCfgR4(flags)
-
result = ComponentAccumulator()
- result.merge(MuonGeoModelToolCfg(flags))
-
- if flags.Muon.enableAlignment and not forceDisableAlignment:
- result.merge(MuonDetectorCondAlgCfg(flags))
-
- result.merge(MuonIdHelperSvcCfg(flags)) # This line can be removed once the configuration methods for all 258 components which directly use this service are updated!!
+ geoModelSvc = result.getPrimaryAndMerge(GeoModelCfg(flags))
+ geoModelSvc.DetectorTools+= [result.popToolsAndMerge(MuonDetectorToolCfg(flags, FillCacheInitTime = 0))]
return result
diff --git a/MuonSpectrometer/MuonConfig/python/RPC_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/RPC_DigitizationConfig.py
index fc840b0d875eb13b1cb7f59591cb16a487f4631a..1f9587ca9577eba52ec16d106ed59b20f4549c79 100644
--- a/MuonSpectrometer/MuonConfig/python/RPC_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/RPC_DigitizationConfig.py
@@ -144,7 +144,7 @@ def RPC_DigitizationBasicCfg(flags, **kwargs):
def RPC_OverlayDigitizationBasicCfg(flags, **kwargs):
"""Return ComponentAccumulator with RPC Overlay digitization"""
- acc = MuonGeoModelCfg(flags, forceDisableAlignment=not flags.Overlay.DataOverlay)
+ acc = MuonGeoModelCfg(flags)
if flags.Common.ProductionStep != ProductionStep.FastChain:
from SGComps.SGInputLoaderConfig import SGInputLoaderCfg
diff --git a/MuonSpectrometer/MuonConfig/python/TGC_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/TGC_DigitizationConfig.py
index 816f121e6b3df77d07336c8932f8ad0937f1c1f4..40c846a6b55797ef3222484f430e4a6c76804b28 100644
--- a/MuonSpectrometer/MuonConfig/python/TGC_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/TGC_DigitizationConfig.py
@@ -123,7 +123,7 @@ def TGC_DigitizationBasicCfg(flags, **kwargs):
def TGC_OverlayDigitizationBasicCfg(flags, **kwargs):
"""Return ComponentAccumulator with TGC Overlay digitization"""
- acc = MuonGeoModelCfg(flags, forceDisableAlignment=not flags.Overlay.DataOverlay)
+ acc = MuonGeoModelCfg(flags)
if flags.Common.ProductionStep != ProductionStep.FastChain:
from SGComps.SGInputLoaderConfig import SGInputLoaderCfg
acc.merge(SGInputLoaderCfg(flags, ["TGCSimHitCollection#TGC_Hits"]))
diff --git a/MuonSpectrometer/MuonConfig/python/sTGC_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/sTGC_DigitizationConfig.py
index 265d20c36fa9724a9d802185b7da5d4297815de3..06071dfb1ee736d25852381a0111b616faa6528c 100644
--- a/MuonSpectrometer/MuonConfig/python/sTGC_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/sTGC_DigitizationConfig.py
@@ -127,7 +127,7 @@ def sTGC_DigitizationBasicCfg(flags, **kwargs):
def sTGC_OverlayDigitizationBasicCfg(flags, **kwargs):
"""Return ComponentAccumulator with sTGC Overlay digitization"""
- acc = MuonGeoModelCfg(flags, forceDisableAlignment=not flags.Overlay.DataOverlay)
+ acc = MuonGeoModelCfg(flags)
if flags.Common.ProductionStep != ProductionStep.FastChain:
from SGComps.SGInputLoaderConfig import SGInputLoaderCfg
if 'sTGCSimHitCollection#sTGCSensitiveDetector' in flags.Input.SecondaryTypedCollections:
diff --git a/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py b/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py
index cf9075c09741a8f89500a32e31847139c6b6b8ef..bf49f253a4a240c2821a280b2ac50760be480659 100644
--- a/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py
+++ b/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py
@@ -39,7 +39,7 @@ def testCfg (flags):
result = ComponentAccumulator()
from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
- result.merge (MuonGeoModelCfg(flags, forceDisableAlignment=True))
+ result.merge (MuonGeoModelCfg(flags))
from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg
result.merge (AtlasFieldCacheCondAlgCfg(flags, UseDCS = False))
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py
index 748e666d6f8668e378513e074f3de604daab02bc..06401726fb518c4f22acbcc6cea50827f8576af9 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py
@@ -38,7 +38,7 @@ def testCfg (configFlags):
result = ComponentAccumulator()
from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
- result.merge (MuonGeoModelCfg(configFlags, forceDisableAlignment=True))
+ result.merge (MuonGeoModelCfg(configFlags))
from MagFieldServices.MagFieldServicesConfig import AtlasFieldCacheCondAlgCfg
result.merge (AtlasFieldCacheCondAlgCfg(configFlags, UseDCS = False))
@@ -55,7 +55,6 @@ from AthenaConfiguration.TestDefaults import defaultTestFiles
flags = initConfigFlags()
flags.Input.Files = defaultTestFiles.RAW_RUN2
-
flags.lock()
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
acc=MainServicesCfg(flags)
diff --git a/Trigger/TrigT1/TrigT1MuonRecRoiTool/python/TrigT1MuonRecRoiToolConfig.py b/Trigger/TrigT1/TrigT1MuonRecRoiTool/python/TrigT1MuonRecRoiToolConfig.py
index 8a4110c07a4bf0a01fd276422e6148de567a0021..e7cf4ddf8e93f79bd4ab2c8479e5afcb7fc7aea4 100644
--- a/Trigger/TrigT1/TrigT1MuonRecRoiTool/python/TrigT1MuonRecRoiToolConfig.py
+++ b/Trigger/TrigT1/TrigT1MuonRecRoiTool/python/TrigT1MuonRecRoiToolConfig.py
@@ -1,13 +1,13 @@
#
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
#
from AthenaConfiguration.ComponentFactory import CompFactory
from MuonConfig.MuonCablingConfig import RPCCablingConfigCfg, TGCCablingConfigCfg
-from MuonConfig.MuonGeometryConfig import MuonDetectorCondAlgCfg
+from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
def RPCRecRoiToolCfg(flags, name="RPCRecRoiTool", useRun3Config=True):
acc = RPCCablingConfigCfg(flags)
- acc.merge(MuonDetectorCondAlgCfg(flags))
+ acc.merge(MuonGeoModelCfg(flags))
tool = CompFactory.getComp("LVL1::TrigT1RPCRecRoiTool")(name)
tool.UseRun3Config = useRun3Config
@@ -19,7 +19,7 @@ def RPCRecRoiToolCfg(flags, name="RPCRecRoiTool", useRun3Config=True):
def TGCRecRoiToolCfg(flags, name="TGCRecRoiTool", useRun3Config=True):
acc = TGCCablingConfigCfg(flags)
- acc.merge(MuonDetectorCondAlgCfg(flags))
+ acc.merge(MuonGeoModelCfg(flags))
tool = CompFactory.getComp("LVL1::TrigT1TGCRecRoiTool")(name)
tool.UseRun3Config = useRun3Config