diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondDump/python/dumpMdtCalib.py b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondDump/python/dumpMdtCalib.py
index 5052de32d0e162df5c78b9f9b9a790959fcb0edf..f283c2ffadb7699556528920a0eb5c150064c644 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondDump/python/dumpMdtCalib.py
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondDump/python/dumpMdtCalib.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -15,7 +15,6 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import initConfigFlags
from MuonGeoModelTestR4.testGeoModel import SetupArgParser
parser = SetupArgParser()
- parser.add_argument("--setupRun4", default=False, action="store_true")
parser.add_argument("--outRtJSON" , default="RtConstants.json")
parser.add_argument("--outT0JSON" , default="T0Constants.json")
parser.set_defaults(outRootFile="MdtCalib.root")
@@ -23,9 +22,7 @@ if __name__ == "__main__":
#parser.set_defaults(inputFile = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/data23/ESD/data23_cos.00448208.express_express.recon.ESD.x721/73events.data23_cos.00448208.express_express.recon.ESD.x721._lb0003._SFO-ALL._0001.1"])
#parser.set_defaults(condTag="CONDBR2-BLKPA-2023-02")
args = parser.parse_args()
- from MuonGeoModelTestR4.testGeoModel import setupGeoR4TestCfg, executeTest, setupHistSvcCfg, geoModelFileDefault
- args.geoModelFile = geoModelFileDefault(args.setupRun4)
-
+ from MuonGeoModelTestR4.testGeoModel import setupGeoR4TestCfg, executeTest, setupHistSvcCfg
flags = initConfigFlags()
flags.Muon.Calib.fitAnalyticRt = True
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondDump/python/dumpR4ToyCablings.py b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondDump/python/dumpR4ToyCablings.py
index 43057d33159aaa3e1ba7bcd363dd165a5d30bf8b..ea2390b1bc11dd6d02785f76352576937609501f 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondDump/python/dumpR4ToyCablings.py
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondDump/python/dumpR4ToyCablings.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -14,16 +14,14 @@ def MdtToyCablingJsonDumpAlgCfg(flags, name="MdtToyCablingJsonDumpAlg", **kwargs
result.addEventAlgo(the_alg, primary = True)
return result
if __name__=="__main__":
- from MuonGeoModelTestR4.testGeoModel import setupGeoR4TestCfg, SetupArgParser, executeTest, geoModelFileDefault
+ from MuonGeoModelTestR4.testGeoModel import setupGeoR4TestCfg, SetupArgParser, executeTest
parser = SetupArgParser()
parser.set_defaults(nEvents = 1)
parser.set_defaults(noMM=True)
parser.set_defaults(noSTGC=True)
parser.set_defaults(noTgc=True)
- parser.add_argument("--setupRun4", default=False, action="store_true")
args = parser.parse_args()
- args.geoModelFile = geoModelFileDefault(args.setupRun4)
flags, cfg = setupGeoR4TestCfg(args)
cfg.merge(RpcToyCablingJsonDumpAlgCfg(flags))
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondDump/python/dumpTwinCabling.py b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondDump/python/dumpTwinCabling.py
index 7e9b401e3a4746d377fc729521bb22c226e52cdc..491f3a25bfb21ab46217e59835792e201a1b7a16 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondDump/python/dumpTwinCabling.py
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondDump/python/dumpTwinCabling.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -15,20 +15,19 @@ def MdtToyTwinCablingDumpAlgCfg(flags, name="MdtToyTwinCablingDumpAlg",**kwargs)
if __name__ == "__main__":
- from MuonGeoModelTestR4.testGeoModel import setupGeoR4TestCfg, SetupArgParser, executeTest, geoModelFileDefault
+ from MuonGeoModelTestR4.testGeoModel import setupGeoR4TestCfg, SetupArgParser, executeTest
parser = SetupArgParser()
parser.set_defaults(nEvents = 1)
parser.set_defaults(noMM=True)
parser.set_defaults(noSTGC=True)
parser.set_defaults(noTgc=True)
- parser.add_argument("--setupRun4", default=False, action="store_true")
+ parser.set_defaults(noRpc=True)
parser.add_argument("--cablingMap", default="twinMap.json", help="External JSON file containing the cabling map of each channel")
parser.add_argument("--stationsToTwin",nargs='+', help="Specify the station names for which you want twin tubes",
default=[])
parser.add_argument("--chamberToTwin",nargs='+', help="Specify the station names for which you want twin tubes",
default=["BOL4A13M1", "BOL4C13M1"])
args = parser.parse_args()
- args.geoModelFile = geoModelFileDefault(args.setupRun4)
flags, cfg = setupGeoR4TestCfg(args)
cfg.merge(MdtToyTwinCablingDumpAlgCfg(flags,
stationsToTwin = args.stationsToTwin,
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/CMakeLists.txt
index a24b7859a8c79ee4eddef798e06e5a5efa5b2161..29e620e3a2a26ad30f2ace4582bf2fa1fc152abd 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/CMakeLists.txt
@@ -46,12 +46,12 @@ atlas_add_test( RpcCabling_Run3MC
atlas_add_test( RpcCabling_Run4MC
- SCRIPT python -m MuonCondDump.dumpR4ToyCablings --setupRun4 && python -m MuonCondTest.RpcCablingTesterR4 --setupRun4 --JSONFile RpcCabling.json
+ SCRIPT python -m MuonCondDump.dumpR4ToyCablings --defaultGeoFile RUN4 && python -m MuonCondTest.RpcCablingTesterR4 --defaultGeoFile RUN4 --JSONFile RpcCabling.json
PRIVATE_WORKING_DIRECTORY
PROPERTIES TIMEOUT 1200
POST_EXEC_SCRIPT nopost.sh)
atlas_add_test( RpcCabling_Run4MC_COOL
- SCRIPT python -m MuonCondTest.RpcCablingTesterR4 --setupRun4
+ SCRIPT python -m MuonCondTest.RpcCablingTesterR4 --defaultGeoFile RUN4
PRIVATE_WORKING_DIRECTORY
PROPERTIES TIMEOUT 1200
POST_EXEC_SCRIPT nopost.sh)
@@ -89,13 +89,13 @@ atlas_add_test( TgcDigiJitterTest
atlas_add_test( MdtCalibDbR4Test
- SCRIPT python -m MuonCondTest.MdtCalibDbTesterR4 --setupRun4
+ SCRIPT python -m MuonCondTest.MdtCalibDbTesterR4 --defaultGeoFile RUN4
PRIVATE_WORKING_DIRECTORY
PROPERTIES TIMEOUT 1200
POST_EXEC_SCRIPT nopost.sh)
atlas_add_test( MdtTwinCablingTest
- SCRIPT python -m MuonCondDump.dumpTwinCabling --setupRun4 --cablingMap twinCabling.json --chamberToTwin all && python -m MuonCondTest.MdtTwinTester --setupRun4 --cablingJSON twinCabling.json
+ SCRIPT python -m MuonCondDump.dumpTwinCabling --defaultGeoFile RUN4 --cablingMap twinCabling.json --chamberToTwin all && python -m MuonCondTest.MdtTwinTester --defaultGeoFile RUN4 --cablingJSON twinCabling.json
PRIVATE_WORKING_DIRECTORY
PROPERTIES TIMEOUT 1200
POST_EXEC_SCRIPT nopost.sh)
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/MdtCalibDbTesterR4.py b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/MdtCalibDbTesterR4.py
index 5f65b7ff5d90a9910895fb9514844c701bf40b58..548c7df01f32326edd59fdb95a4c2d55db7253aa 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/MdtCalibDbTesterR4.py
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/MdtCalibDbTesterR4.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
def MdtCalibTestAlgCfg(flags, name="MdtCalibDbTestAlg", **kwargs):
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -8,9 +8,8 @@ def MdtCalibTestAlgCfg(flags, name="MdtCalibDbTestAlg", **kwargs):
return result
if __name__ == "__main__":
- from MuonGeoModelTestR4.testGeoModel import setupGeoR4TestCfg, SetupArgParser, executeTest, geoModelFileDefault
+ from MuonGeoModelTestR4.testGeoModel import setupGeoR4TestCfg, SetupArgParser, executeTest
parser = SetupArgParser()
- parser.add_argument("--setupRun4", default=False, action="store_true")
parser.add_argument("--rtJSON", help="Location of the RT json file", default="")
parser.add_argument("--t0JSON", help="Location of the T0 json file", default="")
parser.set_defaults(nEvents = 1)
@@ -24,7 +23,6 @@ if __name__ == "__main__":
flags.Muon.Calib.readMdtJSON = True
args = parser.parse_args()
- args.geoModelFile = geoModelFileDefault(args.setupRun4)
flags, cfg = setupGeoR4TestCfg(args, flags)
from MuonConfig.MuonCalibrationConfig import MdtCalibDbAlgCfg
cfg.merge(MdtCalibDbAlgCfg(flags,RtJSON = args.rtJSON, TubeT0JSON = args.t0JSON))
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/MdtTwinTester.py b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/MdtTwinTester.py
index 8f2b246f78356c00f94829718487a4cc9356cde5..d7304c2e92e7de437d1b61ed02448101773e4819 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/MdtTwinTester.py
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/MdtTwinTester.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
def MdtTwinCablingTestCfg(flags, name="MdtTwinMappingTestAlg", **kwargs):
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -10,9 +10,8 @@ def MdtTwinCablingTestCfg(flags, name="MdtTwinMappingTestAlg", **kwargs):
if __name__ == "__main__":
- from MuonGeoModelTestR4.testGeoModel import setupGeoR4TestCfg, SetupArgParser, executeTest, geoModelFileDefault
+ from MuonGeoModelTestR4.testGeoModel import setupGeoR4TestCfg, SetupArgParser, executeTest
parser = SetupArgParser()
- parser.add_argument("--setupRun4", default=True, action="store_true")
parser.add_argument("--cablingJSON", help="Location of the twin tube cabling file to test", type=str, default="")
parser.set_defaults(nEvents = 1)
parser.set_defaults(noMM=True)
@@ -21,7 +20,6 @@ if __name__ == "__main__":
parser.set_defaults(noTgc=True)
args = parser.parse_args()
- args.geoModelFile = geoModelFileDefault(args.setupRun4)
flags, cfg = setupGeoR4TestCfg(args)
from MuonConfig.MuonCablingConfig import MdtTwinTubeMapCondAlgCfg
cfg.merge(MdtTwinTubeMapCondAlgCfg(flags, JSONFile = args.cablingJSON))
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/RpcCablingTesterR4.py b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/RpcCablingTesterR4.py
index 82401769fdabce1f7f6d98b309a191edb5098df4..a4ff5ea2f122f9863d5b8eceed1ca201d1965aa4 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/RpcCablingTesterR4.py
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/python/RpcCablingTesterR4.py
@@ -1,11 +1,10 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
if __name__ == "__main__":
from MuonCondTest.RpcCablingTester import RpcCablingTestAlgCfg
- from MuonGeoModelTestR4.testGeoModel import setupGeoR4TestCfg, SetupArgParser, executeTest, geoModelFileDefault
+ from MuonGeoModelTestR4.testGeoModel import setupGeoR4TestCfg, SetupArgParser, executeTest
parser = SetupArgParser()
parser.add_argument("--JSONFile", help="External cabling JSON file", default="")
- parser.add_argument("--setupRun4", default=False, action="store_true")
parser.set_defaults(nEvents = 1)
parser.set_defaults(noMM=True)
parser.set_defaults(noSTGC=True)
@@ -13,7 +12,6 @@ if __name__ == "__main__":
parser.set_defaults(noTgc=True)
args = parser.parse_args()
- args.geoModelFile = geoModelFileDefault(args.setupRun4)
flags, cfg = setupGeoR4TestCfg(args)
cfg.merge(RpcCablingTestAlgCfg(flags, TestStations = [], JSONFile = args.JSONFile))
cfg.getService("MessageSvc").debugLimit = 2147483647
diff --git a/MuonSpectrometer/MuonPhaseII/MuonDetDescr/MuonGeoModelTestR4/CMakeLists.txt b/MuonSpectrometer/MuonPhaseII/MuonDetDescr/MuonGeoModelTestR4/CMakeLists.txt
index aa6580a7a1c87b45f7e0e5d7b6150fa611099bd4..fc6811c7a4423edfe93dbc73a4dd604910f59efb 100644
--- a/MuonSpectrometer/MuonPhaseII/MuonDetDescr/MuonGeoModelTestR4/CMakeLists.txt
+++ b/MuonSpectrometer/MuonPhaseII/MuonDetDescr/MuonGeoModelTestR4/CMakeLists.txt
@@ -49,7 +49,7 @@ atlas_add_test( testR3GeometryData
#### Standard geometry dumping test R4 (MC)
atlas_add_test( testR4Geometry
- SCRIPT python -m MuonGeoModelTestR4.testGeoModel --chambers BML1A3 T1E1A01 MML1A1 STL1A1 --geoModelFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/MuonRecRTT/ATLAS-R4-MUONTEST.db --condTag OFLCOND-MC21-SDR-RUN4-01 --geoTag ATLAS-P2-RUN4-01-00-00
+ SCRIPT python -m MuonGeoModelTestR4.testGeoModel --chambers BML1A3 T1E1A01 MML1A1 STL1A1 --defaultGeoFile RUN4 --condTag OFLCOND-MC21-SDR-RUN4-01 --geoTag ATLAS-P2-RUN4-01-00-00
PROPERTIES TIMEOUT 600
PRIVATE_WORKING_DIRECTORY
POST_EXEC_SCRIPT nopost.sh)
@@ -70,7 +70,7 @@ atlas_add_test( testR3SensitiveDetectors
##### Simulation test R4
atlas_add_test( testR4SensitiveDetectors
- SCRIPT python -m MuonGeoModelTestR4.testSensitiveDetectors --nEvents 2 --geoModelFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/MuonRecRTT/ATLAS-R4-MUONTEST.db
+ SCRIPT python -m MuonGeoModelTestR4.testSensitiveDetectors --nEvents 2 --defaultGeoFile RUN4
PROPERTIES TIMEOUT 600
PRIVATE_WORKING_DIRECTORY
POST_EXEC_SCRIPT nopost.sh)
@@ -82,7 +82,7 @@ atlas_add_test( testChamberBuilding
POST_EXEC_SCRIPT nopost.sh)
#### Test that the sector envelopes fully enclose the particular chambers (R4)
atlas_add_test( testChamberBuildingR4
- SCRIPT python -m MuonGeoModelTestR4.testChamberBuilder --noSTGC --geoModelFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/MuonRecRTT/ATLAS-R4-MUONTEST.db
+ SCRIPT python -m MuonGeoModelTestR4.testChamberBuilder --noSTGC --defaultGeoFile RUN4
PROPERTIES TIMEOUT 1200
PRIVATE_WORKING_DIRECTORY
POST_EXEC_SCRIPT nopost.sh)
diff --git a/MuonSpectrometer/MuonPhaseII/MuonDetDescr/MuonGeoModelTestR4/python/testGeoModel.py b/MuonSpectrometer/MuonPhaseII/MuonDetDescr/MuonGeoModelTestR4/python/testGeoModel.py
index e6c1788ef7839036ef8817ca91cdb1c543375ee0..cb6b6aba13ef77076dd8e40390366af94e02122a 100644
--- a/MuonSpectrometer/MuonPhaseII/MuonDetDescr/MuonGeoModelTestR4/python/testGeoModel.py
+++ b/MuonSpectrometer/MuonPhaseII/MuonDetDescr/MuonGeoModelTestR4/python/testGeoModel.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -24,6 +24,7 @@ def SetupArgParser():
],
help="Input file to run on ", nargs="+")
parser.add_argument("--geoModelFile", default = geoModelFileDefault(), help="GeoModel SqLite file containing the muon geometry.")
+ parser.add_argument("--defaultGeoFile", help="Use the predefined GeoModel files on cvmfs", choices=["NONE", "RUN3", "RUN4" ], default="NONE")
parser.add_argument("--chambers", default=["all"], nargs="+", help="Chambers to check. If string is all, all chambers will be checked")
parser.add_argument("--excludedChambers", default=[], nargs="+", help="Chambers to exclude. If string contains 'none', all chambers will be checked. Note: adding a chamber to --excludedChambers will overwrite it being in --chambers.")
parser.add_argument("--outRootFile", default="NewGeoModelDump.root", help="Output ROOT file to dump the geomerty")
@@ -117,7 +118,11 @@ def setupGeoR4TestCfg(args, flags = None):
flags.Exec.FPE= 500
flags.Exec.EventPrintoutInterval = args.eventPrintoutLevel
- if args.geoModelFile.startswith("root://"):
+ if args.defaultGeoFile == "RUN3":
+ flags.GeoModel.SQLiteDBFullPath = geoModelFileDefault(useR4Layout = False)
+ elif args.defaultGeoFile == "RUN4":
+ flags.GeoModel.SQLiteDBFullPath = geoModelFileDefault(useR4Layout = True)
+ elif args.geoModelFile.startswith("root://"):
if not path.exists("Geometry/{geoTag}.db".format(geoTag=args.geoTag)):
print ("Copy geometry file from EOS {source}".format(source = args.geoModelFile))
system("mkdir Geometry/")
@@ -125,11 +130,14 @@ def setupGeoR4TestCfg(args, flags = None):
geoTag=args.geoTag))
args.geoModelFile = "Geometry/{geoTag}.db".format(geoTag=args.geoTag)
- print ("Use geometry file: {geoFile}".format(geoFile = args.geoModelFile))
+ else:
+ flags.GeoModel.SQLiteDBFullPath = args.geoModelFile
+
+ print ("Use geometry file: {geoFile}".format(geoFile = flags.GeoModel.SQLiteDBFullPath))
flags.GeoModel.AtlasVersion = args.geoTag
flags.IOVDb.GlobalTag = args.condTag
flags.GeoModel.SQLiteDB = True
- flags.GeoModel.SQLiteDBFullPath = args.geoModelFile
+
flags.Detector.GeometryBpipe = False
### Inner detector
diff --git a/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonCalibrationTest/CMakeLists.txt b/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonCalibrationTest/CMakeLists.txt
index 42521837aedd0fa90449d5b10f91f4bea656cc81..cb722cabeb53b52e25c97217daf30d23f8bf81d8 100644
--- a/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonCalibrationTest/CMakeLists.txt
+++ b/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonCalibrationTest/CMakeLists.txt
@@ -17,7 +17,7 @@ atlas_add_component( MuonCalibrationTest
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_add_test( MdtCalibrationTest
- SCRIPT python -m MuonCalibrationTest.MuonCalibrationTesterConfig --nEvents 2 --noMM --noSTGC
+ SCRIPT python -m MuonCalibrationTest.MuonCalibrationTesterConfig --nEvents 2
PROPERTIES TIMEOUT 600
PRIVATE_WORKING_DIRECTORY
POST_EXEC_SCRIPT nopost.sh)
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonCalibrationTest/python/MuonCalibrationTesterConfig.py b/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonCalibrationTest/python/MuonCalibrationTesterConfig.py
index d6acd658298c189d446928c75a2e5ef461369202..7055b0f5f6cd22305d73f687b9abd7fa4021d7ba 100644
--- a/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonCalibrationTest/python/MuonCalibrationTesterConfig.py
+++ b/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonCalibrationTest/python/MuonCalibrationTesterConfig.py
@@ -10,20 +10,19 @@ def MdtCalibDbAlgTestCfg(flags, name = "MdtCalibDbAlgTest", **kwargs):
return result
if __name__=="__main__":
- from MuonGeoModelTestR4.testGeoModel import setupGeoR4TestCfg, SetupArgParser, executeTest,setupHistSvcCfg,geoModelFileDefault
+ from MuonGeoModelTestR4.testGeoModel import setupGeoR4TestCfg, SetupArgParser, executeTest,setupHistSvcCfg
parser = SetupArgParser()
- parser.add_argument("--setupRun4", default=True, action="store_true")
parser.set_defaults(nEvents = -1)
parser.set_defaults(outRootFile="MdtCalibDbAlgTest.root")
parser.set_defaults(inputFile=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/MuonGeomRTT/R4SimHits.pool.root"])
parser.set_defaults(eventPrintoutLevel = 1000)
+ parser.set_defaults(defaultGeoFile="RUN4")
parser.set_defaults(noMM=True)
parser.set_defaults(noSTGC=True)
parser.set_defaults(noRpc=True)
parser.set_defaults(noTgc=True)
args = parser.parse_args()
- args.geoModelFile = geoModelFileDefault(args.setupRun4)
from AthenaConfiguration.AllConfigFlags import initConfigFlags
flags = initConfigFlags()
flags.PerfMon.doFullMonMT = True
diff --git a/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonPatternRecognitionTest/CMakeLists.txt b/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonPatternRecognitionTest/CMakeLists.txt
index 39f30ce3ee02ec9f59c2c8c42842e493925022eb..4bdbfc42411a9f5555b18ccc92b6889b804be529 100644
--- a/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonPatternRecognitionTest/CMakeLists.txt
+++ b/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonPatternRecognitionTest/CMakeLists.txt
@@ -33,7 +33,7 @@ atlas_add_test( HoughTransformTestR3_fromRDO
atlas_add_test( HoughTransformTestR4
- SCRIPT python -m MuonPatternRecognitionTest.MuonHoughTransformTesterConfig --noMonitorPlots --nEvents 2 --noMM --noSTGC --geoModelFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/MuonRecRTT/ATLAS-R4-MUONTEST.db --condTag OFLCOND-MC21-SDR-RUN4-01 --geoTag ATLAS-P2-RUN4-01-00-00 --inputFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/MuonGeomRTT/R4SimHits.pool.root
+ SCRIPT python -m MuonPatternRecognitionTest.MuonHoughTransformTesterConfig --noMonitorPlots --nEvents 2 --noMM --noSTGC --defaultGeoFile RUN4 --condTag OFLCOND-MC21-SDR-RUN4-01 --geoTag ATLAS-P2-RUN4-01-00-00 --inputFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/MuonGeomRTT/R4SimHits.pool.root
PROPERTIES TIMEOUT 600
PRIVATE_WORKING_DIRECTORY
POST_EXEC_SCRIPT nopost.sh)