Merge branch 'muon-geo' into 'main'

Muon configuration: explicitly set geometry tag in tests

See merge request !68055

MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondDump/python/MdtMezzExtraction.py

@@ -24,6 +24,7 @@ if __name__ == "__main__":
     flags.Concurrency.NumConcurrentEvents = args.threads  # Might change this later, but good enough for the moment.
     flags.Output.ESDFileName = args.output
     flags.Input.Files = args.inputFile
+    flags.GeoModel.AtlasVersion = args.geometry
     flags.lock()   
     
     cfg = MdtCablMezzAlgCfg(flags,

MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/MdtCablingTester.py

@@ -8,6 +8,7 @@ def SetupArgParser():
     parser.add_argument("-o", "--output", dest="output", default='', help="Text file containing each cabling channel", metavar="FILE")
     parser.add_argument("--inputFile", "-i", default=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data17_13TeV.00330470.physics_Main.daq.RAW._lb0310._SFO-1._0001.data"], 
                         help="Input file to run on ", nargs="+")
+    parser.add_argument("--geometry", default="ATLAS-R2-2016-01-00-01", help="Geometry tag")
     parser.add_argument("--mezzMap", default="", help="External JSON file containing the internal mapping of the mezzanine cards")
     parser.add_argument("--cablingMap", default="", help="External JSON file containing the cabling map of each channel")
     return parser
@@ -54,7 +55,8 @@ if __name__ == "__main__":
     flags.Concurrency.NumThreads = args.threads
     flags.Concurrency.NumConcurrentEvents = args.threads  # Might change this later, but good enough for the moment.
     flags.Output.ESDFileName = args.output
-    flags.Input.Files = args.inputFile    
+    flags.Input.Files = args.inputFile
+    flags.GeoModel.AtlasVersion = args.geometry
     flags.lock()
     
     cfg = MdtCablingTestAlgCfg(flags,

MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py

-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -182,9 +182,10 @@ def MuonCablingConfigCfg(flags):
 
 if __name__ == '__main__':
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
-    from AthenaConfiguration.TestDefaults import defaultTestFiles
+    from AthenaConfiguration.TestDefaults import defaultTestFiles, defaultGeometryTags
     flags = initConfigFlags()
     flags.Input.Files = defaultTestFiles.RAW_RUN2
+    flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
     flags.lock()
 
     acc = ComponentAccumulator()
@@ -195,6 +196,3 @@ if __name__ == '__main__':
     f=open('MuonCabling.pkl','wb')
     acc.store(f)
     f.close()
-
-    
-

MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py

 #
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration.
 #
 # File: MuonMDT_CnvTools/share/MdtRdoToPrepDataTool_test.py
 # Author: scott snyder
@@ -52,11 +52,13 @@ def testCfg (flags):
 
 
 from AthenaConfiguration.AllConfigFlags import initConfigFlags
-from AthenaConfiguration.TestDefaults import defaultTestFiles
+from AthenaConfiguration.TestDefaults import defaultTestFiles, defaultGeometryTags
 
 flags = initConfigFlags()
 flags.Input.Files = defaultTestFiles.RAW_RUN2
+flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
 flags.lock()
+
 from AthenaConfiguration.MainServicesConfig import MainServicesCfg 
 acc=MainServicesCfg(flags)