Merge branch '24.0_RPCcabling' into '24.0'

MuonConfig: drop RPC cabling map override

See merge request atlas/athena!69714

MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py

@@ -41,11 +41,6 @@ def RPCCablingConfigCfg(flags):
         # Relevant folder tags are set for now, until new global tag (RUN3-02) becomes avaialble
         rpcTrigEta="/RPC/TRIGGER/CM_THR_ETA <tag>RPCTriggerCMThrEta_RUN12_MC16_04</tag> <forceRunNumber>330000</forceRunNumber>"
         rpcTrigPhi="/RPC/TRIGGER/CM_THR_PHI <tag>RPCTriggerCMThrPhi_RUN12_MC16_04</tag> <forceRunNumber>330000</forceRunNumber>"
-        from AthenaConfiguration.Enums  import LHCPeriod
-        if flags.Input.isMC and flags.GeoModel.Run >= LHCPeriod.Run3:        # from Run3 on geometry
-           rpcCabMap="/RPC/CABLING/MAP_SCHEMA <tag>RPCCablingMapSchema_2015-2018Run3-4</tag> <forceRunNumber>330000</forceRunNumber>"
-           rpcCabMapCorr="/RPC/CABLING/MAP_SCHEMA_CORR <tag>RPCCablingMapSchemaCorr_2015-2018Run3-4</tag> <forceRunNumber>330000</forceRunNumber>"
-
 
     from IOVDbSvc.IOVDbSvcConfig import addFolders
     acc.merge(addFolders(flags, [rpcCabMap,rpcCabMapCorr], dbName, className='CondAttrListCollection' ))

Tools/WorkflowTestRunner/python/References.py

@@ -25,7 +25,7 @@ references_map = {
     "q442": "v1",
     "q449": "v1",
     "q452": "v1",
-    "q454": "v1",
+    "q454": "v2",
     # Derivations
     "data_PHYS_Run2": "v1",
     "data_PHYS_Run3": "v1",