diff --git a/Calorimeter/CaloClusterCorrection/test/ToolWithConstants_test.py b/Calorimeter/CaloClusterCorrection/test/ToolWithConstants_test.py
index 52debc35d7f104dc37ca09d92d8504d1cda6b67e..a80d1444f50db5ab518b711ec442f5d7f2c51d56 100755
--- a/Calorimeter/CaloClusterCorrection/test/ToolWithConstants_test.py
+++ b/Calorimeter/CaloClusterCorrection/test/ToolWithConstants_test.py
@@ -93,7 +93,7 @@ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
flags = initConfigFlags()
flags.Input.Files = defaultTestFiles.RDO_RUN2
-flags.Input.TimeStamp = 1000
+flags.Input.TimeStamps = [1000]
flags.lock()
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
diff --git a/Calorimeter/CaloCondPhysAlgs/python/CaloScaleNoiseConfig.py b/Calorimeter/CaloCondPhysAlgs/python/CaloScaleNoiseConfig.py
index ac1b2ce37aeb166df8f33611f631f490430ece32..79f2b64298e9e048d0665910297f82fd707d1ba5 100644
--- a/Calorimeter/CaloCondPhysAlgs/python/CaloScaleNoiseConfig.py
+++ b/Calorimeter/CaloCondPhysAlgs/python/CaloScaleNoiseConfig.py
@@ -101,8 +101,8 @@ if __name__=="__main__":
from AthenaConfiguration.AllConfigFlags import initConfigFlags
flags = initConfigFlags()
- flags.Input.RunNumber=rlb[0]
- flags.Input.TimeStamp=TimeStamp
+ flags.Input.RunNumbers=[rlb[0]]
+ flags.Input.TimeStamps=[TimeStamp]
flags.Input.Files=[]
flags.IOVDb.DatabaseInstance="CONDBR2"
diff --git a/Calorimeter/CaloDetDescr/python/CaloDetDescrManager_test.py b/Calorimeter/CaloDetDescr/python/CaloDetDescrManager_test.py
index 5365d2fb3cd8c32262e977c3c2f188f9e74a56c1..c865fe643beb0d851959f197cefe966373b31a44 100644
--- a/Calorimeter/CaloDetDescr/python/CaloDetDescrManager_test.py
+++ b/Calorimeter/CaloDetDescr/python/CaloDetDescrManager_test.py
@@ -74,7 +74,7 @@ def testCfg(configFlags):
ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
-ConfigFlags.Input.TimeStamp = 1000
+ConfigFlags.Input.TimeStamps = [1000]
ConfigFlags.Detector.GeometryLAr = True
ConfigFlags.Detector.GeometryTile = True
ConfigFlags.needFlagsCategory('Tile')
diff --git a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py
index 4eb56b3e87569a84198a11f5d0fda328c573d8af..288f9681e3a477ba4bd6e5bcfa5aa9bf22d20bd4 100644
--- a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py
+++ b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py
@@ -54,7 +54,7 @@ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
flags = initConfigFlags()
flags.Input.Files = defaultTestFiles.RDO_RUN2
-flags.Input.TimeStamp = 1000
+flags.Input.TimeStamps = [1000]
flags.Detector.GeometryLAr = True
flags.Detector.GeometryTile = True
flags.needFlagsCategory('Tile')
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py
index ee1ee9354c1dfc592011287ada7e99a99b41befd..a3994066d541763950dcae903e6deefd86ba55aa 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py
+++ b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py
@@ -141,7 +141,7 @@ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
flags = initConfigFlags()
flags.Input.Files = defaultTestFiles.RDO_RUN2
-flags.Input.TimeStamp = 1000
+flags.Input.TimeStamps = [1000]
flags.Detector.GeometryLAr = True
flags.Detector.GeometryTile = True
flags.needFlagsCategory('Tile')
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py
index efd5d4ca8b1bca18855d3cf66b1b37f91783ae57..c10db2bc81168b24e7d347c5fbef913110b82d05 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py
+++ b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py
@@ -77,7 +77,7 @@ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
flags = initConfigFlags()
flags.Input.Files = defaultTestFiles.RDO_RUN2
-flags.Input.TimeStamp = 1000
+flags.Input.TimeStamps = [1000]
flags.Detector.GeometryLAr = True
flags.Detector.GeometryTile = True
flags.needFlagsCategory('Tile')
diff --git a/Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py b/Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py
index 846a338fa73b3ddc9250acaac4799ed02c59bbe5..2a425e4e5d04d9cc0d83c4b1a23c26adc1f34e01 100755
--- a/Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py
+++ b/Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py
@@ -47,7 +47,7 @@ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
flags = initConfigFlags()
flags.Input.Files = defaultTestFiles.RDO_RUN2
-flags.Input.TimeStamp = 1000
+flags.Input.TimeStamps = [1000]
flags.lock()
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index 021ebe6bf2ae0d7e39e9375b7d8dfd571d5c62b7..3f0d9a734fa94bcc3e5d5c7d004193faabfa9212 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -56,11 +56,11 @@ def initConfigFlags():
acf.addFlag('Input.SecondaryFiles', []) # secondary input files for DoubleEventSelector
acf.addFlag('Input.isMC', lambda prevFlags : "IS_SIMULATION" in GetFileMD(prevFlags.Input.Files).get("eventTypes", [])) # former global.isMC
acf.addFlag('Input.OverrideRunNumber', False )
- acf.addFlag("Input.ConditionsRunNumber", -1) # Override the HITS file Run Number with one from a data run (TODO merge with Input.RunNumber)
- acf.addFlag('Input.RunNumber', lambda prevFlags : list(GetFileMD(prevFlags.Input.Files).get("runNumbers", []))) # former global.RunNumber
+ acf.addFlag("Input.ConditionsRunNumber", -1) # Override the HITS file Run Number with one from a data run (TODO merge with Input.RunNumbers)
+ acf.addFlag('Input.RunNumbers', lambda prevFlags : list(GetFileMD(prevFlags.Input.Files).get("runNumbers", []))) # former global.RunNumber
acf.addFlag('Input.MCChannelNumber', lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("mc_channel_number", 0))
- acf.addFlag('Input.LumiBlockNumber', lambda prevFlags : list(GetFileMD(prevFlags.Input.Files).get("lumiBlockNumbers", []))) # former global.RunNumber
- acf.addFlag('Input.TimeStamp', lambda prevFlags : getInitialTimeStampsFromRunNumbers(prevFlags.Input.RunNumber) if prevFlags.Input.OverrideRunNumber else [])
+ acf.addFlag('Input.LumiBlockNumbers', lambda prevFlags : list(GetFileMD(prevFlags.Input.Files).get("lumiBlockNumbers", []))) # former global.RunNumber
+ acf.addFlag('Input.TimeStamps', lambda prevFlags : getInitialTimeStampsFromRunNumbers(prevFlags.Input.RunNumbers) if prevFlags.Input.OverrideRunNumber else [])
# Configure EvtIdModifierSvc with a list of dictionaries of the form:
# {'run': 152166, 'lb': 202, 'starttstamp': 1269948352889940910, 'evts': 1, 'mu': 0.005}
acf.addFlag("Input.RunAndLumiOverrideList", [])
diff --git a/Control/AthenaConfiguration/python/AutoConfigOnlineRecoFlags.py b/Control/AthenaConfiguration/python/AutoConfigOnlineRecoFlags.py
index 8d5a6643c76d8cb1d74af9f595d359e4c6dd9940..5dc37a5046b91d48e8b1d14d2b3c09a27c83b243 100644
--- a/Control/AthenaConfiguration/python/AutoConfigOnlineRecoFlags.py
+++ b/Control/AthenaConfiguration/python/AutoConfigOnlineRecoFlags.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 AthenaCommon.SystemOfUnits import GeV, TeV
from AthenaCommon.Logging import logging
@@ -20,9 +20,9 @@ def setDefaultOnlineRecoFlags(flags):
flags.Input.Files = []
flags.Input.isMC = False
- flags.Input.RunNumber = [-1]
- flags.Input.LumiBlockNumber = [-1]
- flags.Input.TimeStamp = [-1]
+ flags.Input.RunNumbers = [-1]
+ flags.Input.LumiBlockNumbers = [-1]
+ flags.Input.TimeStamps = [-1]
flags.Input.ProjectName = 'data_test'
flags.Input.Format = Format.BS
flags.Input.ProcessingTags = []
@@ -74,7 +74,7 @@ def trySetFlagsFromIS(flags, partition=None):
# Run number
run_number = tryReadFromISObject(runparams, 'run_number')
if run_number is not None:
- flags.Input.RunNumber = [run_number]
+ flags.Input.RunNumbers = [run_number]
# Tier-0 project name
project_name = tryReadFromISObject(runparams, 'T0_project_tag')
if project_name is not None:
@@ -109,11 +109,11 @@ def trySetFlagsFromIS(flags, partition=None):
# LB number
lb_number = tryReadFromISObject(lbinfo, 'LumiBlockNumber')
if lb_number is not None:
- flags.Input.LumiBlockNumber = [lb_number]
+ flags.Input.LumiBlockNumbers = [lb_number]
# Timestamp
time_ns = tryReadFromISObject(lbinfo, 'Time')
if time_ns is not None:
- flags.Input.TimeStamp = [int(time_ns / 1e9)]
+ flags.Input.TimeStamps = [int(time_ns / 1e9)]
# Solenoid status
solenoid_curr_is = tryReadISObject('DCS_GENERAL.MagnetSolenoidCurrent.value', 'DdcFloatInfo', part_name='initial')
diff --git a/Control/AthenaConfiguration/python/MainServicesConfig.py b/Control/AthenaConfiguration/python/MainServicesConfig.py
index ce6b8919a4a93cf1304786fa67bce8f0ac34756a..03de5fd8a4d3e36c3d0ecc6dc3d826e7cd19d738 100644
--- a/Control/AthenaConfiguration/python/MainServicesConfig.py
+++ b/Control/AthenaConfiguration/python/MainServicesConfig.py
@@ -320,8 +320,8 @@ def MainEvgenServicesCfg(flags, LoopMgr='AthenaEventLoopMgr',seqName="AthAlgSeq"
"""ComponentAccumulator-based equivalent of:
import AthenaCommon.AtlasUnixGeneratorJob
- NB Must have set ConfigFlags.Input.RunNumber and
- ConfigFlags.Input.TimeStamp before calling to avoid
+ NB Must have set flags.Input.RunNumbers and
+ flags.Input.TimeStamps before calling to avoid
attempted auto-configuration from an input file.
"""
cfg = MainServicesCfg(flags, LoopMgr)
@@ -337,8 +337,8 @@ if __name__=="__main__":
from AthenaConfiguration.AllConfigFlags import initConfigFlags
flags = initConfigFlags()
try:
- flags.Input.RunNumber = 284500 # Set to either MC DSID or MC Run Number
- flags.Input.TimeStamp = 1 # dummy value
+ flags.Input.RunNumbers = [284500] # Set to either MC DSID or MC Run Number
+ flags.Input.TimeStamps = [1] # dummy value
cfg = MainEvgenServicesCfg(flags)
except ModuleNotFoundError:
# The McEventSelector package required by MainEvgenServicesCfg is not part of the AthAnalysis project
diff --git a/Control/AthenaConfiguration/test/testFPEHandling.py b/Control/AthenaConfiguration/test/testFPEHandling.py
index 6df8e716430688d9a22da9d3e9e8b9e153107747..8c0bccf384bdd4da7db4a34b867fbc99e7a8112c 100755
--- a/Control/AthenaConfiguration/test/testFPEHandling.py
+++ b/Control/AthenaConfiguration/test/testFPEHandling.py
@@ -14,8 +14,8 @@ if __name__=="__main__":
from AthenaConfiguration.AllConfigFlags import initConfigFlags
flags = initConfigFlags()
- flags.Input.RunNumber = 284500 # dummay value
- flags.Input.TimeStamp = 1 # dummy value
+ flags.Input.RunNumbers = [284500] # dummay value
+ flags.Input.TimeStamps = [1] # dummy value
flags.Exec.FPE=FPEFlag
cfg = MainEvgenServicesCfg(flags)
diff --git a/Control/AthenaKernel/python/EventIdOverrideConfig.py b/Control/AthenaKernel/python/EventIdOverrideConfig.py
index addc808e690b2d996825a41b03db6408ade08fdb..c38d6eded2365b5a158843481a230b8dd4cddf62 100644
--- a/Control/AthenaKernel/python/EventIdOverrideConfig.py
+++ b/Control/AthenaKernel/python/EventIdOverrideConfig.py
@@ -52,7 +52,7 @@ def buildListOfModifiers(flags):
Modifiers += add_modifier(run_nbr=el["run"], evt_nbr=evt_nbr, time_stamp=el["starttstamp"], lbk_nbr=el["lb"], nevts=el["evts"])
elif DataRunNumber>0:
assert DataRunNumber >= 0, (
- "ConfigFlags.Input.ConditionsRunNumber %d is negative. "
+ "flags.Input.ConditionsRunNumber %d is negative. "
"Use a real run number from data." % DataRunNumber)
# Using event numbers to avoid "some very large number" setting
@@ -66,15 +66,15 @@ def buildListOfModifiers(flags):
FirstLB = 1
Modifiers += add_modifier(run_nbr=DataRunNumber, lbk_nbr=FirstLB, time_stamp=InitialTimeStamp, nevts=totalNumber)
- elif flags.Input.RunNumber:
+ elif flags.Input.RunNumbers:
# Behaviour for Simulation jobs. For standard Simulation we
# override the run number once per job. TODO Still need to deal with the specific case of DataOverlay
- myRunNumber = flags.Input.RunNumber[0]
+ myRunNumber = flags.Input.RunNumbers[0]
assert myRunNumber >= 0, (
- "ConfigFlags.Input.RunNumber[0] %d is negative. "
+ "flags.Input.RunNumbers[0] %d is negative. "
"Use a real run number from data." % myRunNumber)
- myFirstLB = flags.Input.LumiBlockNumber[0]
- myInitialTimeStamp = flags.Input.TimeStamp[0]
+ myFirstLB = flags.Input.LumiBlockNumbers[0]
+ myInitialTimeStamp = flags.Input.TimeStamps[0]
# Using event numbers to avoid "some very large number" setting
totalNumber = 1000000
@@ -95,7 +95,7 @@ def getFirstLumiBlock(flags, run):
allLBs += [el["lb"]]
return min(allLBs) + 0
else:
- return flags.Input.LumiBlockNumber[0]
+ return flags.Input.LumiBlockNumbers[0]
def getMinMaxRunNumbers(flags):
@@ -112,15 +112,15 @@ def getMinMaxRunNumbers(flags):
# Behaviour for Digitization jobs using DataRunNumber
DataRunNumber = flags.Input.ConditionsRunNumber
assert DataRunNumber >= 0, (
- "ConfigFlags.Input.ConditionsRunNumber %d is negative. "
+ "flags.Input.ConditionsRunNumber %d is negative. "
"Use a real run number from data." % DataRunNumber)
mini = DataRunNumber
maxi = DataRunNumber+1
- elif flags.Input.RunNumber:
+ elif flags.Input.RunNumbers:
# Behaviour for Simulation jobs
- myRunNumber = flags.Input.RunNumber[0]
+ myRunNumber = flags.Input.RunNumbers[0]
assert myRunNumber >= 0, (
- "ConfigFlags.Input.RunNumber[0] %d is negative. "
+ "flags.Input.RunNumbers[0] %d is negative. "
"Use a real run number from data." % myRunNumber)
mini = myRunNumber
maxi = 2147483647
diff --git a/Control/DataModelTest/DataModelRunTests/python/DataModelTestConfig.py b/Control/DataModelTest/DataModelRunTests/python/DataModelTestConfig.py
index fee0dfba9840247aa273ca961f4ef3bd5b9f0c99..70ae3c34fe762727272f574b93d637e8775f749b 100644
--- a/Control/DataModelTest/DataModelRunTests/python/DataModelTestConfig.py
+++ b/Control/DataModelTest/DataModelRunTests/python/DataModelTestConfig.py
@@ -39,8 +39,8 @@ def DataModelTestFlags (infile = None, evtMax = 20, **kw):
# Block input file peeking.
from Campaigns.Utils import Campaign
- flags.Input.RunNumber = 0
- flags.Input.TimeStamp = 0
+ flags.Input.RunNumbers = [0]
+ flags.Input.TimeStamps = [0]
flags.Input.ProcessingTags = []
flags.Input.TypedCollections = []
flags.Input.isMC = True
diff --git a/DataQuality/DataQualityTools/python/DQTLumiMonAlg.py b/DataQuality/DataQualityTools/python/DQTLumiMonAlg.py
index 75fcaaeefc038aba1106a1e636e144cc1b37705d..49aab6c4b2384b104df015c039b8cb531e2449e3 100644
--- a/DataQuality/DataQualityTools/python/DQTLumiMonAlg.py
+++ b/DataQuality/DataQualityTools/python/DQTLumiMonAlg.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
#
def DQTLumiMonAlgConfig(flags, isOld=False):
@@ -51,8 +51,8 @@ def DQTLumiMonAlgConfigByTriggerChain(helper, algConfObj, flags, isOld, triggerC
lbdict = { 'xmin': lbnum-0.5 if lbnum>0 else 0.5,
'xmax': lbnum+0.5 if lbnum>0 else 1.5 }
else:
- lbdict = { 'xmin': min(flags.Input.LumiBlockNumber)-0.5 if flags.Input.LumiBlockNumber else 0.5,
- 'xmax': max(flags.Input.LumiBlockNumber)+0.5 if flags.Input.LumiBlockNumber else 1.5 }
+ lbdict = { 'xmin': min(flags.Input.LumiBlockNumbers)-0.5 if flags.Input.LumiBlockNumbers else 0.5,
+ 'xmax': max(flags.Input.LumiBlockNumbers)+0.5 if flags.Input.LumiBlockNumbers else 1.5 }
lbdict['xbins'] = int(lbdict['xmax']-lbdict['xmin'])
# Raw plots of lumi variables
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolReadConfig.py b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolReadConfig.py
index 5cc809e0382e1c5831364f913bf9b1cc8745a66a..38e50c9544ff16699a01b67e48d0b4d3921dee85 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolReadConfig.py
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolReadConfig.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
@@ -22,14 +22,14 @@ def EventSelectorAthenaPoolCfg(flags):
FirstLB = 1
InitialTimeStamp = flags.IOVDb.RunToTimestampDict.get(DataRunNumber, 1) # TODO fix repeated configuration
if not flags.Sim.DoFullChain:
- OldRunNumber = flags.Input.RunNumber[0] # CHECK this should be the Run Number from the HITS file
- elif flags.Input.RunNumber:
+ OldRunNumber = flags.Input.RunNumbers[0] # CHECK this should be the Run Number from the HITS file
+ elif flags.Input.RunNumbers:
# Behaviour for Simulation jobs
- DataRunNumber = flags.Input.RunNumber[0]
- FirstLB = flags.Input.LumiBlockNumber[0]
- InitialTimeStamp = flags.Input.TimeStamp[0]
+ DataRunNumber = flags.Input.RunNumbers[0]
+ FirstLB = flags.Input.LumiBlockNumbers[0]
+ InitialTimeStamp = flags.Input.TimeStamps[0]
assert DataRunNumber >= 0, (
- "configFlags.Input.OverrideRunNumber was True, but provided DataRunNumber (%d) is negative. "
+ "flags.Input.OverrideRunNumber was True, but provided DataRunNumber (%d) is negative. "
"Use a real run number from data." % DataRunNumber)
evSel.OverrideRunNumber = flags.Input.OverrideRunNumber
evSel.RunNumber = DataRunNumber
@@ -54,12 +54,13 @@ def EventSelectorAthenaPoolCfg(flags):
pass
from AthenaKernel.EventIdOverrideConfig import EvtIdModifierSvcCfg
result.merge(EvtIdModifierSvcCfg(flags))
- elif flags.Common.ProductionStep in [ProductionStep.Simulation] and len(flags.Input.RunNumber) and flags.Sim.ISF.ReSimulation:
+ elif flags.Common.ProductionStep in [ProductionStep.Simulation] and len(flags.Input.RunNumbers) and flags.Sim.ISF.ReSimulation:
# ReSimulation case
evSel.OverrideRunNumber = True
- evSel.RunNumber = flags.Input.RunNumber[0]
- if flags.Input.LumiBlockNumber: evSel.FirstLB = flags.Input.LumiBlockNumber[0]
- evSel.InitialTimeStamp = flags.IOVDb.RunToTimestampDict.get(flags.Input.RunNumber[0], 1)
+ evSel.RunNumber = flags.Input.RunNumbers[0]
+ if flags.Input.LumiBlockNumbers:
+ evSel.FirstLB = flags.Input.LumiBlockNumbers[0]
+ evSel.InitialTimeStamp = flags.IOVDb.RunToTimestampDict.get(flags.Input.RunNumbers[0], 1)
result.addService(evSel)
return result
diff --git a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
index 9316518af0ab62aaf2f8a2611ffb60e8a5a5f4f6..ba5d7a83929c3c37e8680bf71baf91087f7aa8ee 100644
--- a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
+++ b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
@@ -112,7 +112,7 @@ def ByteStreamWriteCfg(flags, type_names=None):
A component accumulator fragment containing the components required to
write to bytestream. Should be merged into main job configuration.
"""
- all_runs = set(flags.Input.RunNumber)
+ all_runs = set(flags.Input.RunNumbers)
assert (
len(all_runs) == 1
), "Input is from multiple runs, do not know which one to use {}".format(
diff --git a/Generators/CosmicGenerator/python/CosmicGeneratorConfig.py b/Generators/CosmicGenerator/python/CosmicGeneratorConfig.py
index 4cf6d221556ec5fb28b521f23743ff08b0aac3d5..ede91e659f40043d49231cacd2c72ab5c6b959a3 100644
--- a/Generators/CosmicGenerator/python/CosmicGeneratorConfig.py
+++ b/Generators/CosmicGenerator/python/CosmicGeneratorConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 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
@@ -199,7 +199,7 @@ def CosmicGeneratorCfg(flags, name="CosmicGenerator", **kwargs):
kwargs.setdefault('rvert_max', 300000.) # - radius in mm for generating primary vertex
# Random seeding
- kwargs.setdefault("Dsid", flags.Input.RunNumber[0]) # Could (should?) set this as Input.MCChannelNumber currently trying to match legacy config
+ kwargs.setdefault("Dsid", flags.Input.RunNumbers[0]) # Could (should?) set this as Input.MCChannelNumber currently trying to match legacy config
#kwargs.setdefault("RandomSeed", flags.Sim.RandomSeedOffset) # No such flag in ConfigFlags. TODO Add?
result.addEventAlgo(CompFactory.CosmicGenerator('CosmicGenerator', **kwargs))
diff --git a/Generators/McEventSelector/python/McEventSelectorConfig.py b/Generators/McEventSelector/python/McEventSelectorConfig.py
index c04a33bc2bb80d0a1a0552133184e809c858144b..81759af8e7661ae59e7ea9084d865719cf73fdf8 100644
--- a/Generators/McEventSelector/python/McEventSelectorConfig.py
+++ b/Generators/McEventSelector/python/McEventSelectorConfig.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
@@ -10,14 +10,10 @@ def McEventSelectorCfg(flags, **kwargs):
cfg.addService(CompFactory.EvtPersistencySvc("EventPersistencySvc",
CnvServices=[service.getFullJobOptName()]))
- runNumber = flags.Input.RunNumber
- if isinstance(runNumber, type([])) and runNumber:
- runNumber = runNumber[0]
- kwargs.setdefault("RunNumber", runNumber)
- timeStamp = flags.Input.TimeStamp
- if isinstance(timeStamp, type([])) and timeStamp:
- timeStamp = timeStamp[0]
- kwargs.setdefault("InitialTimeStamp", timeStamp)
+ if flags.Input.RunNumbers:
+ kwargs.setdefault("RunNumber", flags.Input.RunNumbers[0])
+ if flags.Input.TimeStamps:
+ kwargs.setdefault("InitialTimeStamp", flags.Input.TimeStamps[0])
evSel = CompFactory.McEventSelector("EventSelector", **kwargs)
cfg.addService(evSel)
diff --git a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/share/CreateMisalignmentITk.py b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/share/CreateMisalignmentITk.py
index 5aa224f85a8432abd2e2e6d903588319140af577..10225b19a264ae09b7ff54e2436f6dcc8f9c78a7 100644
--- a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/share/CreateMisalignmentITk.py
+++ b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/share/CreateMisalignmentITk.py
@@ -15,7 +15,7 @@ from AthenaConfiguration.ComponentFactory import CompFactory
def getFlags(**kwargs):
flags=initConfigFlags()
- flags.Input.RunNumber = 2222222 # Set to either MC DSID or MC Run Number
+ flags.Input.RunNumbers = [2222222] # Set to either MC DSID or MC Run Number
## Just enable ID for the moment.
flags.Input.isMC = True
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
index ad375cd6fc33fd17240eb4d167f64990659aa379..b3dd902ba83a76b59ae3e7f489d1a75dfabcd8bb 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
@@ -50,10 +50,10 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_Run2.dat"
else:
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping.dat"
- elif not flags.Input.RunNumber:
+ elif not flags.Input.RunNumbers:
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
else:
- runNum = flags.Input.RunNumber[0]
+ runNum = flags.Input.RunNumbers[0]
if runNum < 222222:
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
else:
@@ -117,7 +117,7 @@ def PixelCablingCondAlgCfg(flags, name="PixelCablingCondAlg", **kwargs):
if not flags.Input.isMC and not flags.Overlay.DataOverlay and not flags.GeoModel.Run < LHCPeriod.Run2 :
acc.merge(addFoldersSplitOnline(flags, "PIXEL", "/PIXEL/Onl/CablingMap","/PIXEL/CablingMap", className="AthenaAttributeList"))
kwargs.setdefault("ReadKey", "/PIXEL/CablingMap")
- if flags.Input.RunNumber and flags.Input.RunNumber[0]<222222:
+ if flags.Input.RunNumbers and flags.Input.RunNumbers[0]<222222:
kwargs.setdefault("ReadKey", "")
else:
kwargs.setdefault("ReadKey", "")
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ByteStreamErrorsTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ByteStreamErrorsTestAlgConfig.py
index b513eb9d0007f6fa713caecbdea2832f101aaf5b..3143573433e8dae007b81c7b136478115a5d03e5 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ByteStreamErrorsTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ByteStreamErrorsTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_ByteStreamErrorsTestAlg
-Copyright (C) 2002-2021 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
@@ -23,7 +23,7 @@ if __name__=="__main__":
flags.Input.isMC = False
flags.Input.Files = ["./myESD.pool.root"]
flags.Input.ProjectName = "data17_13TeV" # q431 input
- flags.Input.RunNumber = 330470 # q431 input
+ flags.Input.RunNumbers = [330470] # q431 input
flags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2018-03" # q431 setup
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsAlgorithmsConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsAlgorithmsConfig.py
index 98768fa7acf0c5d4da75726a9820920117ae2a6c..6ec7280b5d00b0d4cded6c2d7c2cc3568364dd9c 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsAlgorithmsConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsAlgorithmsConfig.py
@@ -142,7 +142,7 @@ if __name__=="__main__":
flags.Input.isMC = False
flags.Input.Files = ["./myESD.pool.root"]
flags.Input.ProjectName = "data17_13TeV" # q431 input
- flags.Input.RunNumber = 330470 # q431 input
+ flags.Input.RunNumbers = [330470] # q431 input
flags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2018-03" # q431 setup
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsParameterTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsParameterTestAlgConfig.py
index 577b2eba94b523d1f8a6a1393634ddd9f869fed1..6f03f9cfc72e7400fb55b6b64b8bdc4f9a45ba08 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsParameterTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsParameterTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_ConditionsParameterTestAlg
-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
@@ -23,8 +23,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = False
flags.Input.ProjectName = "data12_8TeV"
- flags.Input.RunNumber = 215643
- flags.Input.TimeStamp = 1354748400 # LB 469 of run 215643, 2012-12-05 @ 11:00pm (UTC)
+ flags.Input.RunNumbers = [215643]
+ flags.Input.TimeStamps = [1354748400] # LB 469 of run 215643, 2012-12-05 @ 11:00pm (UTC)
flags.IOVDb.GlobalTag = "COMCOND-BLKPA-RUN1-09"
flags.IOVDb.DatabaseInstance = "COMP200"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsSummaryTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsSummaryTestAlgConfig.py
index a99e75de509370cade0a9d088eb9ade1ace323a3..c1a113ba3d37a11b9bc001be0cb71dfce791ab02 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsSummaryTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsSummaryTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_ConditionsSummaryTestAlg
-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
@@ -24,8 +24,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = False
flags.Input.ProjectName = "data17_13TeV"
- flags.Input.RunNumber = [310809]
- flags.Input.TimeStamp = 1476741326 # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC)
+ flags.Input.RunNumbers = [310809]
+ flags.Input.TimeStamps = [1476741326] # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC)
flags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-06"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConfigurationConditionsTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConfigurationConditionsTestAlgConfig.py
index 13c318f2f19f3e4c2847ffe05a7198b813e0ce1f..fa5c541d1576074f1daf6f55081abc0a7af8f9d1 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConfigurationConditionsTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConfigurationConditionsTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_ConfigurationConditionsTestAlg
-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
@@ -23,8 +23,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = True
flags.Input.ProjectName = "mc16_13TeV"
- flags.Input.RunNumber = 310000 # MC16e 2018 run number
- flags.Input.TimeStamp = 1550000000 # MC16e 2018 time stamp
+ flags.Input.RunNumbers = [310000] # MC16e 2018 run number
+ flags.Input.TimeStamps = [1550000000] # MC16e 2018 time stamp
flags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-RUN2-01"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_DCSConditionsTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_DCSConditionsTestAlgConfig.py
index a69feb718d66b7ced51e3abc5380051ac79d9da7..b987d6727f8cf9abaf353cc1f9d080760a074e6c 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_DCSConditionsTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_DCSConditionsTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_DCSConditionsTestAlg
-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
@@ -23,8 +23,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = False
flags.Input.ProjectName = "data16_13TeV"
- flags.Input.RunNumber = 310809
- flags.Input.TimeStamp = 1476741326 # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC)
+ flags.Input.RunNumbers = [310809]
+ flags.Input.TimeStamps = [1476741326] # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC)
flags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-06"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_FlaggedConditionTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_FlaggedConditionTestAlgConfig.py
index a9ce28c5ebbcad89d0720c0299f9f9d5c101789e..f304162f89870ffc3a50388ed9b7cffdb494294b 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_FlaggedConditionTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_FlaggedConditionTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_FlaggedConditionTestAlg
-Copyright (C) 2002-2021 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
@@ -23,7 +23,7 @@ if __name__=="__main__":
flags.Input.isMC = False
flags.Input.Files = ["./myESD.pool.root"]
flags.Input.ProjectName = "data17_13TeV" # q431 input
- flags.Input.RunNumber = 330470 # q431 input
+ flags.Input.RunNumbers = [330470] # q431 input
flags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2018-03" # q431 setup
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_LinkMaskingTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_LinkMaskingTestAlgConfig.py
index 094fdfb3f237cbcd26d8383b4828ac65b0b06917..52d1e6fc54edaa497459f3f7a28e886d36d22adc 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_LinkMaskingTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_LinkMaskingTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_LinkMaskingTestAlg
-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
@@ -23,8 +23,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = False
flags.Input.ProjectName = "data16_13TeV"
- flags.Input.RunNumber = 310809
- flags.Input.TimeStamp = 1476741326 # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC)
+ flags.Input.RunNumbers = [310809]
+ flags.Input.TimeStamps = [1476741326] # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC)
flags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-10"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MajorityConditionsTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MajorityConditionsTestAlgConfig.py
index bb2b9e06d1c51e9dae0e051ded5d95fb57f6fe37..c1efcc5d56b19d115ef8a2773f4676f6a75d5695 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MajorityConditionsTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MajorityConditionsTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_MajorityConditionsTestAlg
-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
@@ -23,8 +23,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = False
flags.Input.ProjectName = "data16_13TeV"
- flags.Input.RunNumber = 310809
- flags.Input.TimeStamp = 1476741326 # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC)
+ flags.Input.RunNumbers = [310809]
+ flags.Input.TimeStamps = [1476741326] # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC)
flags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-06"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ModuleVetoTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ModuleVetoTestAlgConfig.py
index de93a05c4b5fc545a74789d42bd7439ca7805f5b..1c6dac6ff960c19329d692f8042ec7c741406702 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ModuleVetoTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ModuleVetoTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_ModuleVetoTestAlg
-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
@@ -23,8 +23,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = True
flags.Input.ProjectName = "mc16_13TeV"
- flags.Input.RunNumber = 300000 # MC16c 2017 run number
- flags.Input.TimeStamp = 1500000000 # MC16c 2017 time stamp
+ flags.Input.RunNumbers = [300000] # MC16c 2017 run number
+ flags.Input.TimeStamps = [1500000000] # MC16c 2017 time stamp
flags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MonitorConditionsTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MonitorConditionsTestAlgConfig.py
index a0672460481d8f5244ebab0cfcd8d2559dcffcc7..8c5bd7c34634d5153e0bf17d51c0c63f2a584297 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MonitorConditionsTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MonitorConditionsTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_MonitorConditionsTestAlg
-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
@@ -23,8 +23,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = True
flags.Input.ProjectName = "mc16_13TeV"
- flags.Input.RunNumber = 310000 # MC16e 2018 run number
- flags.Input.TimeStamp = 1550000000 # MC16e 2018 time stamp
+ flags.Input.RunNumbers = [310000] # MC16e 2018 run number
+ flags.Input.TimeStamps = [1550000000] # MC16e 2018 time stamp
flags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-RUN2-01"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_RODVetoTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_RODVetoTestAlgConfig.py
index 14987346dac39c3f44b927bcb7f12e5798a449c4..579e75f8f8dfcd820e242777cc0871480038dc69 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_RODVetoTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_RODVetoTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_RODVetoTestAlg
-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
@@ -24,8 +24,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = True
flags.Input.ProjectName = "mc16_13TeV"
- flags.Input.RunNumber = 300000 # MC16c 2017 run number
- flags.Input.TimeStamp = 1500000000
+ flags.Input.RunNumbers = [300000] # MC16c 2017 run number
+ flags.Input.TimeStamps = [1500000000]
flags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibChipDataTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibChipDataTestAlgConfig.py
index a8d1152998e910488396e9c8de2efe895d7d8d38..4432e042b670f11cae3a56cb808f47b11a44ac00 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibChipDataTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibChipDataTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_ReadCalibChipDataTestAlg
-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
@@ -23,8 +23,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = True
flags.Input.ProjectName = "mc16_13TeV"
- flags.Input.RunNumber = 300000 # MC16c 2017 run number
- flags.Input.TimeStamp = 1500000000 # MC16c 2017 time stamp
+ flags.Input.RunNumbers = [300000] # MC16c 2017 run number
+ flags.Input.TimeStamps = [1500000000] # MC16c 2017 time stamp
flags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibDataTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibDataTestAlgConfig.py
index 4fa77c9c7c1785104a6406e878a5413e5d0adbdd..7296d96a5ba5cbbeed8787c624f9e19d227318bb 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibDataTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibDataTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_ReadCalibDataTestAlg
-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
@@ -23,8 +23,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = True
flags.Input.ProjectName = "mc16_13TeV"
- flags.Input.RunNumber = 300000 # MC16c 2017 run number
- flags.Input.TimeStamp = 1500000000 # MC16c 2017 time stamp
+ flags.Input.RunNumbers = [300000] # MC16c 2017 run number
+ flags.Input.TimeStamps = [1500000000] # MC16c 2017 time stamp
flags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadoutTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadoutTestAlgConfig.py
index 69d251336f04b9ffc6b6ff006a02817a000a5cbf..89df625e99429f8ce779ca00c81c7eed83c78eee 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadoutTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadoutTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_ReadoutTestAlg
-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
@@ -62,8 +62,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = True
flags.Input.ProjectName = "mc16_13TeV"
- flags.Input.RunNumber = 300000 # MC16c 2017 run number
- flags.Input.TimeStamp = 1500000000
+ flags.Input.RunNumbers = [300000] # MC16c 2017 run number
+ flags.Input.TimeStamps = [1500000000]
flags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SensorsTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SensorsTestAlgConfig.py
index 1881191a799b2111fb2d3ba6d78aa88ce4afa138..104b29e60cefc502f60509a2783ff6a4b8f51727 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SensorsTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SensorsTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_SensorsTestAlg
-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
@@ -23,8 +23,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = False
flags.Input.ProjectName = "data12_8TeV"
- flags.Input.RunNumber = 142913
- flags.Input.TimeStamp = 1260630000 # During run 142913, 12/12/2009 @ 3:00pm (UTC)
+ flags.Input.RunNumbers = [142913]
+ flags.Input.TimeStamps = [1260630000] # During run 142913, 12/12/2009 @ 3:00pm (UTC)
flags.IOVDb.GlobalTag = "COMCOND-BLKPA-RUN1-09"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN1_2012
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SiliconConditionsTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SiliconConditionsTestAlgConfig.py
index 07ae5e4255c35efdb0b610efdc2779ae0245572c..2603f8d2a1623494b151c920ca1df5e1e5cf96cb 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SiliconConditionsTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SiliconConditionsTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_SiliconConditionsTestAlg
-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
@@ -23,8 +23,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = True
flags.Input.ProjectName = "mc16_13TeV"
- flags.Input.RunNumber = 300000 # MC16c 2017 run number
- flags.Input.TimeStamp = 1500000000 # MC16c 2017 time stamp
+ flags.Input.RunNumbers = [300000] # MC16c 2017 run number
+ flags.Input.TimeStamps = [1500000000] # MC16c 2017 time stamp
flags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_StripVetoTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_StripVetoTestAlgConfig.py
index 0861451390015b8e3e4c1eadf5fa6be44d3f01b9..0de76f7e6e4dbd3a08078929d6033cf5449ef396 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_StripVetoTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_StripVetoTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_StripVetoTestAlg
-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
@@ -23,8 +23,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = True
flags.Input.ProjectName = "mc16_13TeV"
- flags.Input.RunNumber = 300000 # MC16c 2017 run number
- flags.Input.TimeStamp = 1500000000 # MC16c 2017 time stamp
+ flags.Input.RunNumbers = [300000] # MC16c 2017 run number
+ flags.Input.TimeStamps = [1500000000] # MC16c 2017 time stamp
flags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_TdaqEnabledTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_TdaqEnabledTestAlgConfig.py
index 46732a17a36b1159f1a486de9aed91707a8db8d2..1760df384d2444fdfd4f1cfd4034b762c8ef61e6 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_TdaqEnabledTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_TdaqEnabledTestAlgConfig.py
@@ -1,6 +1,6 @@
"""Define method to configure and test SCT_TdaqEnabledTestAlg
-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
@@ -23,8 +23,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = False
flags.Input.ProjectName = "data16_13TeV"
- flags.Input.RunNumber = 310809
- flags.Input.TimeStamp = 1476741326 # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC)
+ flags.Input.RunNumbers = [310809]
+ flags.Input.TimeStamps = [1476741326] # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC)
flags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-06"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTSiLorentzAngleTestAlgConfig.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTSiLorentzAngleTestAlgConfig.py
index 6d283e4828e8dd9550355793c5762c8db68e757f..f522978fe86f57961147b2f709a823fd03e224cf 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTSiLorentzAngleTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTSiLorentzAngleTestAlgConfig.py
@@ -25,8 +25,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = True
flags.Input.ProjectName = "mc16_13TeV"
- flags.Input.RunNumber = 300000 # MC16c 2017 run number
- flags.Input.TimeStamp = 1500000000 # MC16c 2017 time stamp
+ flags.Input.RunNumbers = [300000] # MC16c 2017 run number
+ flags.Input.TimeStamps = [1500000000] # MC16c 2017 time stamp
flags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetConditions/SiPropertiesTool/python/SCTSiPropertiesTestAlgConfig.py b/InnerDetector/InDetConditions/SiPropertiesTool/python/SCTSiPropertiesTestAlgConfig.py
index 134fcc8799820d2137940140c062c1c0c15682ee..e1d36a7cd9c67bcaa2f2fbbd339cd1cb43336790 100644
--- a/InnerDetector/InDetConditions/SiPropertiesTool/python/SCTSiPropertiesTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SiPropertiesTool/python/SCTSiPropertiesTestAlgConfig.py
@@ -23,8 +23,8 @@ if __name__=="__main__":
flags.Input.Files = []
flags.Input.isMC = True
flags.Input.ProjectName = "mc16_13TeV"
- flags.Input.RunNumber = 300000 # MC16c 2017 run number
- flags.Input.TimeStamp = 1500000000 # MC16c 2017 time stamp
+ flags.Input.RunNumbers = [300000] # MC16c 2017 run number
+ flags.Input.TimeStamps = [1500000000] # MC16c 2017 time stamp
flags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/python/TestSCT_CablingConfig.py b/InnerDetector/InDetDetDescr/SCT_Cabling/python/TestSCT_CablingConfig.py
index b96a34628bb2cd4f7853d03fc68e2d41787a45c5..15f18b9342f703a33c1c234749893c5a5d4ba6fa 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/python/TestSCT_CablingConfig.py
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/python/TestSCT_CablingConfig.py
@@ -38,8 +38,8 @@ if __name__=="__main__":
flags = initConfigFlags()
flags.Input.Files = []
flags.Input.isMC = True
- flags.Input.RunNumber = [300000]
- flags.Input.TimeStamp = 1500000000
+ flags.Input.RunNumbers = [300000]
+ flags.Input.TimeStamps = [1500000000]
# https://twiki.cern.ch/twiki/bin/viewauth/AtlasComputing/ConditionsRun1RunNumbers
flags.IOVDb.GlobalTag = "OFLCOND-RUN12-SDR-25"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
diff --git a/LArCalorimeter/LArBadChannelTool/python/LArBadChannel2Ascii.py b/LArCalorimeter/LArBadChannelTool/python/LArBadChannel2Ascii.py
index 2024b0aa0790e965b9232e884d6b640f3e8a495f..642e8c8bfacd1aa2f753e082580ffe330921857b 100644
--- a/LArCalorimeter/LArBadChannelTool/python/LArBadChannel2Ascii.py
+++ b/LArCalorimeter/LArBadChannelTool/python/LArBadChannel2Ascii.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.ComponentFactory import CompFactory
from IOVDbSvc.IOVDbSvcConfig import addFolders
from AthenaConfiguration.ComponentAccumulator import ConfigurationError
@@ -90,7 +90,7 @@ if __name__=="__main__":
flags.Input.isMC = False
flags.IOVDb.DatabaseInstance="CONDBR2"
flags.LAr.doAlign=False
- flags.Input.RunNumber=args.runnumber
+ flags.Input.RunNumbers=[args.runnumber]
flags.IOVDb.GlobalTag="CONDBR2-ES1PA-2022-06"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion=defaultGeometryTags.RUN3
@@ -110,7 +110,6 @@ if __name__=="__main__":
#MC Event selector since we have no input data file
from McEventSelector.McEventSelectorConfig import McEventSelectorCfg
cfg.merge(McEventSelectorCfg(flags,
- RunNumber=flags.Input.RunNumber,
FirstLB=args.lbnumber,
EventsPerRun = 1,
FirstEvent = 1,
diff --git a/LArCalorimeter/LArBadChannelTool/python/LArBadChannelDBAlg.py b/LArCalorimeter/LArBadChannelTool/python/LArBadChannelDBAlg.py
index 529754bcd61a80e7f798f5244576775e06bb1304..827c7d91f90f4b356e0ed643c6238ba6fb9a70df 100644
--- a/LArCalorimeter/LArBadChannelTool/python/LArBadChannelDBAlg.py
+++ b/LArCalorimeter/LArBadChannelTool/python/LArBadChannelDBAlg.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.ComponentFactory import CompFactory
from AthenaCommon.Logging import logging
@@ -91,7 +91,7 @@ if __name__=="__main__":
flags.Input.isMC = False
flags.IOVDb.DatabaseInstance="CONDBR2"
flags.LAr.doAlign=False
- flags.Input.RunNumber=args.runnumber if args.runnumber>0 else 300000
+ flags.Input.RunNumbers=[args.runnumber if args.runnumber>0 else 300000]
flags.IOVDb.GlobalTag="CONDBR2-ES1PA-2022-06"
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion=defaultGeometryTags.RUN3
@@ -113,7 +113,6 @@ if __name__=="__main__":
#MC Event selector since we have no input data file
from McEventSelector.McEventSelectorConfig import McEventSelectorCfg
cfg.merge(McEventSelectorCfg(flags,
- RunNumber=flags.Input.RunNumber,
FirstLB=args.lbnumber,
EventsPerRun = 1,
FirstEvent = 1,
diff --git a/LArCalorimeter/LArCafJobs/python/LArSCDumperSkeleton.py b/LArCalorimeter/LArCafJobs/python/LArSCDumperSkeleton.py
index ea8a4c7de44f52f83341232d711b5a6c659a370a..7a9ace939e4309e2d913a8e7295bba2be176e81b 100644
--- a/LArCalorimeter/LArCafJobs/python/LArSCDumperSkeleton.py
+++ b/LArCalorimeter/LArCafJobs/python/LArSCDumperSkeleton.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
import sys
import os
@@ -60,7 +60,7 @@ def fromRunArgs(runArgs):
from LArConditionsCommon.LArRunFormat import getLArDTInfoForRun
try:
- runinfo=getLArDTInfoForRun(flags.Input.RunNumber[0], connstring="COOLONL_LAR/CONDBR2")
+ runinfo=getLArDTInfoForRun(flags.Input.RunNumbers[0], connstring="COOLONL_LAR/CONDBR2")
except Exception:
mlog_SCD.warning("Could not get DT run info, using defaults !")
flags.LArSCDump.doEt=True
diff --git a/LArCalorimeter/LArCalibTools/python/LArCalib_HVScale2NtupleConfig.py b/LArCalorimeter/LArCalibTools/python/LArCalib_HVScale2NtupleConfig.py
index a35feab9d88906ba2ad3c2dde65f3b1c361e6a74..c7f027404d9bd0acea3c070e598865d2367926d7 100644
--- a/LArCalorimeter/LArCalibTools/python/LArCalib_HVScale2NtupleConfig.py
+++ b/LArCalorimeter/LArCalibTools/python/LArCalib_HVScale2NtupleConfig.py
@@ -63,8 +63,8 @@ if __name__=="__main__":
from LArCalibProcessing.LArCalibConfigFlags import addLArCalibFlags
addLArCalibFlags(ConfigFlags)
- ConfigFlags.Input.RunNumber=rlb[0]
- ConfigFlags.Input.TimeStamp=TimeStamp
+ ConfigFlags.Input.RunNumbers=[rlb[0]]
+ ConfigFlags.Input.TimeStamps=[TimeStamp]
ConfigFlags.Input.Files=[]
ConfigFlags.IOVDb.DatabaseInstance="CONDBR2"
diff --git a/LArCalorimeter/LArCalibTools/share/LArConditions2Ntuple.py b/LArCalorimeter/LArCalibTools/share/LArConditions2Ntuple.py
index ec4b4625341ee9b032f9afc654417e5c8ff78faf..595e830a844bdbf3e68290cab9880dcdb28deb00 100755
--- a/LArCalorimeter/LArCalibTools/share/LArConditions2Ntuple.py
+++ b/LArCalorimeter/LArCalibTools/share/LArConditions2Ntuple.py
@@ -62,7 +62,7 @@ if __name__=='__main__':
from LArCalibProcessing.LArCalibConfigFlags import addLArCalibFlags
addLArCalibFlags(flags, args.isSC)
- flags.Input.RunNumber=args.run
+ flags.Input.RunNumbers=[args.run]
from AthenaConfiguration.TestDefaults import defaultGeometryTags
flags.GeoModel.AtlasVersion=defaultGeometryTags.RUN3
@@ -76,7 +76,7 @@ if __name__=='__main__':
flags.LAr.OFCShapeFolder=args.ofcfolder
from AthenaConfiguration.Enums import LHCPeriod
- if flags.Input.RunNumber < 222222:
+ if flags.Input.RunNumbers[0] < 222222:
#Set to run1 for early run-numbers
flags.GeoModel.Run=LHCPeriod.Run1
flags.IOVDb.DatabaseInstance="OFLP200" if flags.Input.isMC else "COMP200"
@@ -103,7 +103,6 @@ if __name__=='__main__':
#MC Event selector since we have no input data file
from McEventSelector.McEventSelectorConfig import McEventSelectorCfg
cfg.merge(McEventSelectorCfg(flags,
- RunNumber = flags.Input.RunNumber,
EventsPerRun = 1,
FirstEvent = 1,
InitialTimeStamp = 0,
@@ -205,8 +204,7 @@ if __name__=='__main__':
))
- rootfile=args.out
- import os
+ rootfile=args.out
if os.path.exists(rootfile):
os.remove(rootfile)
cfg.addService(CompFactory.NTupleSvc(Output = [ "FILE1 DATAFILE='"+rootfile+"' OPT='NEW'" ]))
diff --git a/LArCalorimeter/LArCellRec/python/LArRAWtoSuperCellConfig.py b/LArCalorimeter/LArCellRec/python/LArRAWtoSuperCellConfig.py
index 4b8c2d219ff20ad1d02c0cd76a0f5e2c16774dfb..bdb3b08378ff73bd751d4eb0c43c28103af70133 100644
--- a/LArCalorimeter/LArCellRec/python/LArRAWtoSuperCellConfig.py
+++ b/LArCalorimeter/LArCellRec/python/LArRAWtoSuperCellConfig.py
@@ -5,35 +5,35 @@ from AthenaConfiguration.ComponentFactory import CompFactory
from LArCabling.LArCablingConfig import LArOnOffIdMappingSCCfg
from LArBadChannelTool.LArBadChannelConfig import LArBadChannelCfg, LArMaskedSCCfg
-def LArRAWtoSuperCellCfg(configFlags,name="LArRAWtoSuperCell",mask=True,SCellContainerOut="",SCIn="",doReco=False, bcidShift=0):
+def LArRAWtoSuperCellCfg(flags,name="LArRAWtoSuperCell",mask=True,SCellContainerOut="",SCIn="",doReco=False, bcidShift=0):
result=ComponentAccumulator()
from AthenaCommon.Logging import logging
mlog = logging.getLogger( 'LArRAWtoSuperCellCfg:' )
- result.merge(LArOnOffIdMappingSCCfg(configFlags))
+ result.merge(LArOnOffIdMappingSCCfg(flags))
SCInput=""
if (SCIn != ""):
SCInput = SCIn
- elif ( len(configFlags.Input.RunNumber) > 0 ):
+ elif flags.Input.RunNumbers:
from LArConditionsCommon.LArRunFormat import getLArDTInfoForRun
- runinfo=getLArDTInfoForRun(configFlags.Input.RunNumber[0], connstring="COOLONL_LAR/CONDBR2")
+ runinfo=getLArDTInfoForRun(flags.Input.RunNumbers[0], connstring="COOLONL_LAR/CONDBR2")
for i in range(0,len(runinfo.streamTypes())):
if runinfo.streamTypes()[i] == "SelectedEnergy":
SCInput="SC_ET_ID"
else :
- SCInput=configFlags.LAr.LATOME.DTInfoForL1
+ SCInput=flags.LAr.LATOME.DTInfoForL1
if mask :
LArBadChannelKey="LArBadChannelSC"
else :
LArBadChannelKey=""
- result.merge(LArBadChannelCfg(configFlags,isSC=True) )
+ result.merge(LArBadChannelCfg(flags,isSC=True) )
- if SCellContainerOut=="": SCellContainerOut=configFlags.LAr.DT.ET_IDKey
+ if SCellContainerOut=="": SCellContainerOut=flags.LAr.DT.ET_IDKey
algo = CompFactory.LArRAWtoSuperCell(name,SCellContainerOut=SCellContainerOut,LArBadChannelKey=LArBadChannelKey,BCIDOffset=bcidShift)
- if mask and not configFlags.Input.isMC:
+ if mask and not flags.Input.isMC:
# also setup to read OTF masked supercells if running on data
- result.merge(LArMaskedSCCfg(configFlags))
+ result.merge(LArMaskedSCCfg(flags))
algo.LArMaskedChannelKey="LArMaskedSC"
algo = CompFactory.LArRAWtoSuperCell(name,isReco=doReco,SCellContainerOut=SCellContainerOut,LArBadChannelKey=LArBadChannelKey)
diff --git a/LArCalorimeter/LArConfiguration/python/LArConfigFlags.py b/LArCalorimeter/LArConfiguration/python/LArConfigFlags.py
index d6197d253a476c00e7b6adf3850833a4e0f2c57e..270250d7e596c25141eff2f13c33dac769d3cf0d 100644
--- a/LArCalorimeter/LArConfiguration/python/LArConfigFlags.py
+++ b/LArCalorimeter/LArConfiguration/python/LArConfigFlags.py
@@ -1,6 +1,5 @@
-# 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 __future__ import print_function
from AthenaConfiguration.AthConfigFlags import AthConfigFlags
from AthenaConfiguration.Enums import FlagEnum
from AthenaCommon.Logging import logging
@@ -98,7 +97,7 @@ def _getLArRunInfo(prevFlags):
global _lArRunInfo #Cache of lar run info
if _lArRunInfo is None:
from LArConditionsCommon.LArRunFormat import getLArFormatForRun
- runnbr=prevFlags.Input.RunNumber[0] #If more than one run, assume config for first run is valid for all runs
+ runnbr=prevFlags.Input.RunNumbers[0] #If more than one run, assume config for first run is valid for all runs
dbStr="COOLONL_LAR/"+prevFlags.IOVDb.DatabaseInstance
_lArRunInfo=getLArFormatForRun(run=runnbr,connstring=dbStr)
log.info("Got LArRunInfo for run %d",runnbr)
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_HVCorrConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_HVCorrConfig.py
index cb1979bf7cdbeab9c0adb50f234af590a3869162..1f7fcac4fa23f1dd281a5bd795c69c5513fee5c4 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_HVCorrConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_HVCorrConfig.py
@@ -98,9 +98,9 @@ if __name__=="__main__":
if args.globaltag:
ConfigFlags.IOVDb.GlobalTag=args.globaltag
- ConfigFlags.Input.RunNumber=rlb[0]
- ConfigFlags.Input.LumiBlockNumber=rlb[1]
- ConfigFlags.Input.TimeStamp=TimeStamp
+ ConfigFlags.Input.RunNumbers=[rlb[0]]
+ ConfigFlags.Input.LumiBlockNumbers=[rlb[1]]
+ ConfigFlags.Input.TimeStamps=[TimeStamp]
ConfigFlags.Input.Files=[]
ConfigFlags.IOVDb.DatabaseInstance="CONDBR2"
ConfigFlags.IOVDb.DBConnection="sqlite://;schema="+outputName+".sqlite;dbname=CONDBR2"
@@ -108,7 +108,7 @@ if __name__=="__main__":
ConfigFlags.lock()
cfg=MainEvgenServicesCfg(ConfigFlags)
#First LB not set by McEventSelectorCfg, set it here:
- cfg.getService("EventSelector").FirstLB=ConfigFlags.Input.LumiBlockNumber
+ cfg.getService("EventSelector").FirstLB=ConfigFlags.Input.LumiBlockNumbers[0]
cfg.merge(HVCorrConfig(ConfigFlags,outputName,args.Run,args.LB))
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_OFCPhysConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_OFCPhysConfig.py
index 1b25fedaf82a32ff4f4183d42e56193ae4581f8e..35495f2adf9bcea08a38e2a2b035ee9e6feafa7c 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_OFCPhysConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_OFCPhysConfig.py
@@ -215,7 +215,7 @@ if __name__ == "__main__":
ConfigFlags.GeoModel.AtlasVersion=defaultGeometryTags.RUN3
ConfigFlags.IOVDb.DatabaseInstance="CONDBR2"
ConfigFlags.LAr.doAlign=False
- ConfigFlags.Input.RunNumber=ConfigFlags.LArCalib.Input.RunNumbers[0]
+ ConfigFlags.Input.RunNumbers=ConfigFlags.LArCalib.Input.RunNumbers
#ConfigFlags.Exec.OutputLevel=1
ConfigFlags.fillFromArgs()
ConfigFlags.lock()
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PhysWavePredictionConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PhysWavePredictionConfig.py
index a00ba93431ae151d81cca31d62fbd591e61b7d65..54b273d651ccb5dd1749a44948ff46767c655fdd 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PhysWavePredictionConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PhysWavePredictionConfig.py
@@ -173,7 +173,7 @@ if __name__ == "__main__":
ConfigFlags.GeoModel.AtlasVersion=defaultGeometryTags.RUN3
ConfigFlags.IOVDb.DatabaseInstance="CONDBR2"
ConfigFlags.LAr.doAlign=False
- ConfigFlags.Input.RunNumber=ConfigFlags.LArCalib.Input.RunNumbers[0]
+ ConfigFlags.Input.RunNumbers=ConfigFlags.LArCalib.Input.RunNumbers
#ConfigFlags.Exec.OutputLevel=1
ConfigFlags.fillFromArgs()
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RTMParamsConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RTMParamsConfig.py
index 268299698d50e0087a99fa7402ee6cf453395690..3299e3166e48dba324abb1a36ba074dadb602857 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RTMParamsConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RTMParamsConfig.py
@@ -156,7 +156,7 @@ if __name__ == "__main__":
ConfigFlags.GeoModel.AtlasVersion=defaultGeometryTags.RUN3
ConfigFlags.IOVDb.DatabaseInstance="CONDBR2"
ConfigFlags.LAr.doAlign=False
- ConfigFlags.Input.RunNumber=ConfigFlags.LArCalib.Input.RunNumbers[0]
+ ConfigFlags.Input.RunNumbers=ConfigFlags.LArCalib.Input.RunNumbers
#ConfigFlags.Exec.OutputLevel=1
ConfigFlags.lock()
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_postProcessingConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_postProcessingConfig.py
index 5d36491a2227188d6a1711ae52813431156f4aa4..26611aba742eafe4bb87855652adbb229e0789e1 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_postProcessingConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_postProcessingConfig.py
@@ -75,7 +75,7 @@ if __name__=="__main__":
flags.LAr.doAlign=False
- flags.Input.RunNumber=flags.LArCalib.Input.RunNumbers[0]
+ flags.Input.RunNumbers=flags.LArCalib.Input.RunNumbers
flags.lock()
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArDigits2NtupleDumper.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArDigits2NtupleDumper.py
index 6a881bffb5fd24eae737b0273a9b2f81a1321d18..d7bbfeef38a4c4f224f8f39a6fe44570d82ea312 100755
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArDigits2NtupleDumper.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArDigits2NtupleDumper.py
@@ -57,12 +57,12 @@ if __name__=='__main__':
ConfigFlags.Input.Files = GetInputFilesFromPrefix(args.indir,args.inpref)
if args.run != 0:
- ConfigFlags.Input.RunNumber = [args.run]
+ ConfigFlags.Input.RunNumbers = [args.run]
# first autoconfig
from LArConditionsCommon.LArRunFormat import getLArFormatForRun
try:
- runinfo=getLArFormatForRun(ConfigFlags.Input.RunNumber[0], connstring="COOLONL_LAR/CONDBR2")
+ runinfo=getLArFormatForRun(ConfigFlags.Input.RunNumbers[0], connstring="COOLONL_LAR/CONDBR2")
except Exception:
log.warning("Could not get run info, using defaults !")
if args.nsamp > 0:
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArNewCalib_DelayDump_OFC_Cali.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArNewCalib_DelayDump_OFC_Cali.py
index edbdc0b734d3e5f6887f38b43cb72ce24717fbac..d056dfb0af9392f6a93405f93020608265f11b47 100755
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArNewCalib_DelayDump_OFC_Cali.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArNewCalib_DelayDump_OFC_Cali.py
@@ -48,7 +48,7 @@ if __name__=='__main__':
flags.Input.Files=[]
flags.LArCalib.Input.Files = [ args.infile ]
flags.LArCalib.Input.RunNumbers = [int(args.run),]
- flags.Input.RunNumber = int(args.run)
+ flags.Input.RunNumbers = [int(args.run)]
gainNumMap={"HIGH":0,"MEDIUM":1,"LOW":2}
flags.LArCalib.Gain=gainNumMap[args.gain.upper()]
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArNewCalib_tauR.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArNewCalib_tauR.py
index 59a45b6da10989d0e92c3868d8cdd8541e5d9cf6..f74ccf0d66c3f428819d3b633f32962d66ea0347 100755
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArNewCalib_tauR.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArNewCalib_tauR.py
@@ -49,7 +49,7 @@ if __name__=='__main__':
flags.Input.Files=[]
flags.LArCalib.Input.Files = [ ]
flags.LArCalib.Input.RunNumbers = [int(args.run),]
- flags.Input.RunNumber=flags.LArCalib.Input.RunNumbers[0]
+ flags.Input.RunNumbers=flags.LArCalib.Input.RunNumbers
gainNumMap={"HIGH":0,"MEDIUM":1,"LOW":2}
flags.LArCalib.Gain=gainNumMap[args.gain.upper()]
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArSC2NtupleDumper.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArSC2NtupleDumper.py
index 27dd726f1d9d32e50ccfcec0a67e0f5e829a383a..f5ebc05e9ba1426acad520e9bb776cda7e008fe6 100755
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArSC2NtupleDumper.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArSC2NtupleDumper.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# 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 AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -68,12 +68,12 @@ if __name__=='__main__':
flags.Input.Files = GetInputFilesFromPrefix(args.indir,args.inpref)
if args.run != 0:
- flags.Input.RunNumber = [args.run]
+ flags.Input.RunNumbers = [args.run]
# first autoconfig
from LArConditionsCommon.LArRunFormat import getLArDTInfoForRun
try:
- runinfo=getLArDTInfoForRun(flags.Input.RunNumber[0], connstring="COOLONL_LAR/CONDBR2")
+ runinfo=getLArDTInfoForRun(flags.Input.RunNumbers[0], connstring="COOLONL_LAR/CONDBR2")
except Exception:
log.warning("Could not get DT run info, using defaults !")
flags.LArSCDump.doEt=True
diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py
index 7975b8fa8880f68edd4ded7f0734161405eb5ee9..a2b0f839c32fdf8c682d77478669374406435e5a 100755
--- a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py
+++ b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py
@@ -1,5 +1,5 @@
#!/bin/env python
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
##=======================================================================================
## Name: LArCellConditions.py
@@ -113,9 +113,9 @@ sys.argv = sys.argv[:1] + ['-b']
from AthenaConfiguration.AllConfigFlags import initConfigFlags
flags=initConfigFlags()
flags.Input.Files = []
-flags.Input.TimeStamp = 1000
+flags.Input.TimeStamps = [1000]
flags.Input.isMC=False
-flags.Input.RunNumber=run
+flags.Input.RunNumbers=[run]
flags.IOVDb.DatabaseInstance="CONDBR2" if run>222222 else "COMP200"
flags.IOVDb.GlobalTag=tag
flags.LAr.doAlign=False
diff --git a/LArCalorimeter/LArMonitoring/python/LArDigitalTriggMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArDigitalTriggMonAlg.py
index 2160ee8bea292c3bed0583063e7b372ed628e0ae..e848c24991b02ad57a2e4c17358d7a294b83d640 100644
--- a/LArCalorimeter/LArMonitoring/python/LArDigitalTriggMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArDigitalTriggMonAlg.py
@@ -532,7 +532,7 @@ if __name__=='__main__':
flags.Input.Files = ["/eos/atlas/atlascerngroupdisk/proj-spot/spot-job-inputs/data23_13p6TeV/data23_13p6TeV.00451569.physics_Main.daq.RAW._lb0260._SFO-14._0001.data"]
- flags.Input.RunNumber=[451569]
+ flags.Input.RunNumbers=[451569]
flags.Output.HISTFileName = 'LArDigitalTriggMonOutput.root'
flags.DQ.useTrigger = False
diff --git a/LArCalorimeter/LArMonitoring/python/LArSuperCellMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArSuperCellMonAlg.py
index 1a04eef7555fcdc151944fbfce713cb63072605d..98f7e971284e2c9942b884be3eabb82f957deee5 100644
--- a/LArCalorimeter/LArMonitoring/python/LArSuperCellMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArSuperCellMonAlg.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
#
def LArSuperCellMonConfigOld(inputFlags):
@@ -96,7 +96,7 @@ def LArSuperCellMonConfig(inputFlags, **kwargs):
larLATOMEBuilderAlg=CompFactory.LArLATOMEBuilderAlg("LArLATOMEBuilderAlg")
from LArConditionsCommon.LArRunFormat import getLArDTInfoForRun
try:
- runinfo=getLArDTInfoForRun(inputFlags.Input.RunNumber[0], connstring="COOLONL_LAR/CONDBR2")
+ runinfo=getLArDTInfoForRun(inputFlags.Input.RunNumbers[0], connstring="COOLONL_LAR/CONDBR2")
streamTypes=runinfo.streamTypes()
except Exception as e:
mlog.warning("Could not get DT run info, using defaults !")
diff --git a/LArCalorimeter/LArMonitoring/python/RecoPT_Phase1NewConfig.py b/LArCalorimeter/LArMonitoring/python/RecoPT_Phase1NewConfig.py
index 3283d0cd591f7915b1e65ba051754d0e47f8f542..f5ed48dddfac3c1c6c8958286b3f3679bc504fe6 100644
--- a/LArCalorimeter/LArMonitoring/python/RecoPT_Phase1NewConfig.py
+++ b/LArCalorimeter/LArMonitoring/python/RecoPT_Phase1NewConfig.py
@@ -30,10 +30,10 @@ def LArDTMonitoringConfig(ConfigFlags,STREAM):
mlog = logging.getLogger( 'RecoPT_Phase1' )
from LArConditionsCommon.LArRunFormat import getLArDTInfoForRun
- mlog.info("Run number: "+str(ConfigFlags.Input.RunNumber[0]))
+ mlog.info("Run number: "+str(ConfigFlags.Input.RunNumbers[0]))
try:
- runinfo=getLArDTInfoForRun(ConfigFlags.Input.RunNumber[0], connstring="COOLONL_LAR/CONDBR2")
+ runinfo=getLArDTInfoForRun(ConfigFlags.Input.RunNumbers[0], connstring="COOLONL_LAR/CONDBR2")
streams=runinfo.streamTypes()
nsamples=int(runinfo.streamLengths()[0])
except Exception as e:
diff --git a/LArCalorimeter/LArMonitoring/share/StateLessPT_NewConfig.py b/LArCalorimeter/LArMonitoring/share/StateLessPT_NewConfig.py
index bbf8d1b8175af9d6ebb9b9e148be8cf23c1f6fa0..3efa16d3e7607f21bfef1cf4596fb72f7a21822d 100755
--- a/LArCalorimeter/LArMonitoring/share/StateLessPT_NewConfig.py
+++ b/LArCalorimeter/LArMonitoring/share/StateLessPT_NewConfig.py
@@ -161,9 +161,9 @@ if __name__=='__main__':
flags.GeoModel.AtlasVersion=defaultGeometryTags.RUN2
#overwrite the run number
- flags.Input.RunNumber=[runnumber]
+ flags.Input.RunNumbers=[runnumber]
# overwrite LB number for playback partition if needed....
- flags.Input.LumiBlockNumber=[0]
+ flags.Input.LumiBlockNumbers=[0]
from AthenaConfiguration.DetectorConfigFlags import setupDetectorFlags
setupDetectorFlags(flags, ['LAr'], toggle_geometry=True)
diff --git a/LArCalorimeter/LArMonitoring/share/StateLessPT_Test_NewConfig.py b/LArCalorimeter/LArMonitoring/share/StateLessPT_Test_NewConfig.py
index 16687698a08d5623774dad5c39b759243999e811..831b38430cf4848a72458cb0346698967abde1ef 100755
--- a/LArCalorimeter/LArMonitoring/share/StateLessPT_Test_NewConfig.py
+++ b/LArCalorimeter/LArMonitoring/share/StateLessPT_Test_NewConfig.py
@@ -158,9 +158,9 @@ if __name__=='__main__':
from AthenaConfiguration.AutoConfigOnlineRecoFlags import autoConfigOnlineRecoFlags
autoConfigOnlineRecoFlags(flags,partition)
#overwrite the run number
- flags.Input.RunNumber=[runnumber]
+ flags.Input.RunNumbers=[runnumber]
# overwrite LB number for playback partition if needed....
- flags.Input.LumiBlockNumber=[0]
+ flags.Input.LumiBlockNumbers=[0]
from AthenaConfiguration.DetectorConfigFlags import setupDetectorFlags
setupDetectorFlags(flags, ['LAr'], toggle_geometry=True)
diff --git a/LArCalorimeter/LArROD/python/LArNNChannelBuilder.py b/LArCalorimeter/LArROD/python/LArNNChannelBuilder.py
index 1c66c56beaa52c375053ec4b48bd39da8176ef50..cdea329dd7bbcd03238cdf41996784c5c49e32c6 100644
--- a/LArCalorimeter/LArROD/python/LArNNChannelBuilder.py
+++ b/LArCalorimeter/LArROD/python/LArNNChannelBuilder.py
@@ -69,7 +69,7 @@ def LArNNRawChannelBuilderCfg(configFlags, name="LArNNRawChannelBuilder", **kwar
kwargs.setdefault('defaultPhase',12)
nominalPeakSample=2
from LArConditionsCommon.LArRunFormat import getLArFormatForRun
- larformat=getLArFormatForRun(configFlags.Input.RunNumber[0],connstring="COOLONL_LAR/"+configFlags.IOVDb.DatabaseInstance)
+ larformat=getLArFormatForRun(configFlags.Input.RunNumbers[0],connstring="COOLONL_LAR/"+configFlags.IOVDb.DatabaseInstance)
if larformat is not None:
nominalPeakSample = larformat.firstSample()
else:
diff --git a/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py b/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py
index f42695809e7356eab28e16fd2b61d1ca5be5025c..cd43f47a796801a663bbd0d4a57a2df865c402b6 100644
--- a/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py
+++ b/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py
@@ -66,7 +66,7 @@ def LArRawChannelBuilderAlgCfg(configFlags, **kwargs):
kwargs.setdefault('defaultPhase',12)
nominalPeakSample=2
from LArConditionsCommon.LArRunFormat import getLArFormatForRun
- larformat=getLArFormatForRun(configFlags.Input.RunNumber[0],connstring="COOLONL_LAR/"+configFlags.IOVDb.DatabaseInstance)
+ larformat=getLArFormatForRun(configFlags.Input.RunNumbers[0],connstring="COOLONL_LAR/"+configFlags.IOVDb.DatabaseInstance)
if larformat is not None:
nominalPeakSample = larformat.firstSample()
else:
diff --git a/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py b/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py
index f3869b829c664d6a5ea570b5641ca6f22ff4ccde..f128874c2c6269bcefb975b46b46578289650a1c 100644
--- a/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py
+++ b/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py
@@ -65,7 +65,7 @@ def LArRawChannelBuilderAlgCfg(configFlags, **kwargs):
kwargs.setdefault('defaultPhase',12)
nominalPeakSample=2
from LArConditionsCommon.LArRunFormat import getLArFormatForRun
- larformat=getLArFormatForRun(configFlags.Input.RunNumber[0],connstring="COOLONL_LAR/"+configFlags.IOVDb.DatabaseInstance)
+ larformat=getLArFormatForRun(configFlags.Input.RunNumbers[0],connstring="COOLONL_LAR/"+configFlags.IOVDb.DatabaseInstance)
if larformat is not None:
nominalPeakSample = larformat.firstSample()
else:
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibSegmentCreator/python/MuonSegmentReaderConfig.py b/MuonSpectrometer/MuonCalib/MuonCalibSegmentCreator/python/MuonSegmentReaderConfig.py
index 4754f68bd631b9c8e87f85b9bdceca913858cb3d..ac8046271f650a876f37974258ef231e56d74d14 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibSegmentCreator/python/MuonSegmentReaderConfig.py
+++ b/MuonSpectrometer/MuonCalib/MuonCalibSegmentCreator/python/MuonSegmentReaderConfig.py
@@ -46,9 +46,9 @@ if __name__ == "__main__":
flags.Input.ProjectName=flags.Input.Files[0].split('/')[-1].split('.')[0]
data = flags.Input.Files[0].split('/')[-1].split('.')
if data[1][2:].isdigit():
- flags.Input.RunNumber = [int(data[1][2:])]
+ flags.Input.RunNumbers = [int(data[1][2:])]
else:
- flags.Input.RunNumber = [0] #bogus run number in case parsing filename failed
+ flags.Input.RunNumbers = [0] #bogus run number in case parsing filename failed
flags.Detector.GeometryMDT = True
flags.Detector.GeometryTGC = True
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStream/MuonCalibStreamCnvSvc/python/MuonCalibStreamCnvSvcConfig.py b/MuonSpectrometer/MuonCalib/MuonCalibStream/MuonCalibStreamCnvSvc/python/MuonCalibStreamCnvSvcConfig.py
index 2a79da6d0f3730cceed9c6d5723df22f46c94ea5..45645a6793e860a3c09c77a23e7bce0107c40fc2 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStream/MuonCalibStreamCnvSvc/python/MuonCalibStreamCnvSvcConfig.py
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStream/MuonCalibStreamCnvSvc/python/MuonCalibStreamCnvSvcConfig.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
@@ -30,7 +30,7 @@ def MuonCalibStreamAddressProviderSvcCfg(flags, name = 'MuonCalibStreamAddressPr
def MuonCalibStreamDataProviderSvcCfg(flags, name = 'MuonCalibStreamDataProviderSvc'):
result = ComponentAccumulator()
- result.addService(CompFactory.MuonCalibStreamDataProviderSvc(name,RunNumber = flags.Input.RunNumber[0],LumiBlockNumberFromCool = False, RunNumberFromCool=False), primary = True)
+ result.addService(CompFactory.MuonCalibStreamDataProviderSvc(name,RunNumber = flags.Input.RunNumbers[0],LumiBlockNumberFromCool = False, RunNumberFromCool=False), primary = True)
return result
diff --git a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/ConfigAccumulator.py b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/ConfigAccumulator.py
index 0f0629d3c02f2136342ee3e081199a106b23fa14..64ca0c7c50d98495e7640c7256b6cb23fbd27413 100644
--- a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/ConfigAccumulator.py
+++ b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/ConfigAccumulator.py
@@ -125,7 +125,7 @@ class ConfigAccumulator :
if campaign is None:
campaign = autoconfigFromFlags.Input.MCCampaign
if runNumber is None:
- runNumber = int(autoconfigFromFlags.Input.RunNumber[0])
+ runNumber = int(autoconfigFromFlags.Input.RunNumbers[0])
generatorInfo = autoconfigFromFlags.Input.GeneratorsInfo
else:
# legacy mappings of string arguments
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkConfiguration/python/DerivationSkeleton.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkConfiguration/python/DerivationSkeleton.py
index f9be5d1ec57854bebcd8092443e00b5b8360ee91..cd2ae73cac94b818e3baaa92e0037e3b7b1337e0 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkConfiguration/python/DerivationSkeleton.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkConfiguration/python/DerivationSkeleton.py
@@ -83,8 +83,8 @@ def fromRunArgs(runArgs):
# Fix campaign metadata
from Campaigns.Utils import Campaign, campaign_runs
if flags.Input.isMC and flags.Input.MCCampaign is Campaign.Unknown:
- if flags.Input.RunNumber:
- mc_campaign = campaign_runs.get(flags.Input.RunNumber[0], Campaign.Unknown)
+ if flags.Input.RunNumbers:
+ mc_campaign = campaign_runs.get(flags.Input.RunNumbers[0], Campaign.Unknown)
if mc_campaign is not Campaign.Unknown:
flags.Input.MCCampaign = mc_campaign
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM12.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM12.py
index 5b61fa108f942f03cf55d6f0c01a1cefb837048b..055ff517c0f5dc5187520eac3453bee07922f2e7 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM12.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM12.py
@@ -37,7 +37,7 @@ def JETM12SkimmingToolCfg(ConfigFlags):
if not ConfigFlags.Input.isMC:
# Check if the solenoid was turned on to define skimming
from CoolConvUtilities.MagFieldUtils import getFieldForRun
- magfield=getFieldForRun(ConfigFlags.Input.RunNumber[0],lumiblock=ConfigFlags.Input.LumiBlockNumber[0])
+ magfield=getFieldForRun(ConfigFlags.Input.RunNumbers[0],lumiblock=ConfigFlags.Input.LumiBlockNumbers[0])
addTtbarEvents = magfield.solenoidCurrent() > 0
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/HFHadronsCommonConfig.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/HFHadronsCommonConfig.py
index 05f80ad41955d20a25f0223eafebd76b8bb21240..0ed386af9dffca5e30480fc2cc049594a9cd6db0 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/HFHadronsCommonConfig.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/HFHadronsCommonConfig.py
@@ -7,315 +7,313 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-DSIDList=[
- 346343,
- 346344,
- 346345,
- 410000,
- 410001,
- 410002,
- 410003,
- 410004,
- 410006,
- 410007,
- 410008,
- 410009,
- 410051,
- 410120,
- 410121,
- 410155,
- 410159,
- 410160,
- 410163,
- 410186,
- 410187,
- 410188,
- 410189,
- 410218,
- 410219,
- 410220,
- 410225,
- 410226,
- 410227,
- 410232,
- 410233,
- 410249,
- 410250,
- 410251,
- 410252,
- 410276,
- 410277,
- 410278,
- 410342,
- 410343,
- 410344,
- 410345,
- 410346,
- 410347,
- 410350,
- 410351,
- 410352,
- 410353,
- 410354,
- 410355,
- 410357,
- 410358,
- 410359,
- 410361,
- 410362,
- 410363,
- 410364,
- 410365,
- 410366,
- 410367,
- 410274,
- 410275,
- 410500,
- 410501,
- 410502,
- 410503,
- 410504,
- 410505,
- 410506,
- 410507,
- 410508,
- 410511,
- 410512,
- 410513,
- 410514,
- 410515,
- 410516,
- 410517,
- 410518,
- 410519,
- 410520,
- 410521,
- 410522,
- 410523,
- 410524,
- 410525,
- 410526,
- 410527,
- 410528,
- 410529,
- 410530,
- 410531,
- 410532,
- 410533,
- 410534,
- 410535,
- 410536,
- 410537,
- 410568,
- 410569,
- 301528,
- 301529,
- 301530,
- 301531,
- 301532,
- 303722,
- 303723,
- 303724,
- 303725,
- 303726,
- 407009,
- 407010,
- 407011,
- 407012,
- 407029,
- 407030,
- 407031,
- 407032,
- 407033,
- 407034,
- 407035,
- 407036,
- 407037,
- 407038,
- 407039,
- 407040,
- 407342,
- 407343,
- 407344,
- 407345,
- 407346,
- 407347,
- 407354,
- 407355,
- 407356,
- 407348,
- 407349,
- 407350,
- 410120,
- 426090,
- 426091,
- 426092,
- 426093,
- 426094,
- 426095,
- 426096,
- 426097,
- 429007,
- 410244,
- 410245,
- 410323,
- 410324,
- 410325,
- 410369,
- 410281,
- 410282,
- 410283,
- 364345,
- 364346,
- 364347,
- 364348,
- 410424,
- 410425,
- 410426,
- 410427,
- 410441,
- 410442,
- 410470,
- 410471,
- 410472,
- 410480,
- 410481,
- 410482,
- 410452,
- 410557,
- 410558,
- 410559,
- 410464,
- 410465,
- 410466,
- 411073,
- 411074,
- 411075,
- 411076,
- 411077,
- 411078,
- 411079,
- 411080,
- 411081,
- 411082,
- 411083,
- 411084,
- 411085,
- 411086,
- 411087,
- 411088,
- 411089,
- 411090,
- 411068,
- 411069,
- 411070,
- 411178,
- 411179,
- 411180,
- 411275,
- 410661,
- 410662,
- 410663,
- 410664,
- 410265,
- 410266,
- 410267,
- 412066,
- 412067,
- 412068,
- 412069,
- 412070,
- 412071,
- 412072,
- 412073,
- 412074,
- 411233,
- 411234,
- 411316,
- 411329,
- 411330,
- 411331,
- 411332,
- 411333,
- 411334,
- 411335,
- 411336,
- 411337,
- 412116,
- 412117,
- 412123,
- 413023,
- 421152,
- 421153,
- 421154,
- 421156,
- 421157,
- 421158,
- 504329,
- 504330,
- 504331,
- 504332,
- 504333,
- 504334,
- 504335,
- 504336,
- 504338,
- 504341,
- 504342,
- 504343,
- 504344,
- 504346,
- 600737,
- 600738,
- 600791,
- 600792,
- 601226,
- 601227,
- 601239,
- 601240,
- 601491,
- 601492,
- 601495,
- 601496,
- 601497,
- 601498,
- 601783,
- 601784,
- 700000,
- 700051,
- 700052,
- 700053,
- 700054,
- 700121,
- 700122,
- 700123,
- 700124,
- 700165,
- 700166,
- 700164,
- 700167,
- 700168,
- 700205,
- 700309,
- ]
+DSIDList = [
+ 346343,
+ 346344,
+ 346345,
+ 410000,
+ 410001,
+ 410002,
+ 410003,
+ 410004,
+ 410006,
+ 410007,
+ 410008,
+ 410009,
+ 410051,
+ 410120,
+ 410121,
+ 410155,
+ 410159,
+ 410160,
+ 410163,
+ 410186,
+ 410187,
+ 410188,
+ 410189,
+ 410218,
+ 410219,
+ 410220,
+ 410225,
+ 410226,
+ 410227,
+ 410232,
+ 410233,
+ 410249,
+ 410250,
+ 410251,
+ 410252,
+ 410276,
+ 410277,
+ 410278,
+ 410342,
+ 410343,
+ 410344,
+ 410345,
+ 410346,
+ 410347,
+ 410350,
+ 410351,
+ 410352,
+ 410353,
+ 410354,
+ 410355,
+ 410357,
+ 410358,
+ 410359,
+ 410361,
+ 410362,
+ 410363,
+ 410364,
+ 410365,
+ 410366,
+ 410367,
+ 410274,
+ 410275,
+ 410500,
+ 410501,
+ 410502,
+ 410503,
+ 410504,
+ 410505,
+ 410506,
+ 410507,
+ 410508,
+ 410511,
+ 410512,
+ 410513,
+ 410514,
+ 410515,
+ 410516,
+ 410517,
+ 410518,
+ 410519,
+ 410520,
+ 410521,
+ 410522,
+ 410523,
+ 410524,
+ 410525,
+ 410526,
+ 410527,
+ 410528,
+ 410529,
+ 410530,
+ 410531,
+ 410532,
+ 410533,
+ 410534,
+ 410535,
+ 410536,
+ 410537,
+ 410568,
+ 410569,
+ 301528,
+ 301529,
+ 301530,
+ 301531,
+ 301532,
+ 303722,
+ 303723,
+ 303724,
+ 303725,
+ 303726,
+ 407009,
+ 407010,
+ 407011,
+ 407012,
+ 407029,
+ 407030,
+ 407031,
+ 407032,
+ 407033,
+ 407034,
+ 407035,
+ 407036,
+ 407037,
+ 407038,
+ 407039,
+ 407040,
+ 407342,
+ 407343,
+ 407344,
+ 407345,
+ 407346,
+ 407347,
+ 407354,
+ 407355,
+ 407356,
+ 407348,
+ 407349,
+ 407350,
+ 410120,
+ 426090,
+ 426091,
+ 426092,
+ 426093,
+ 426094,
+ 426095,
+ 426096,
+ 426097,
+ 429007,
+ 410244,
+ 410245,
+ 410323,
+ 410324,
+ 410325,
+ 410369,
+ 410281,
+ 410282,
+ 410283,
+ 364345,
+ 364346,
+ 364347,
+ 364348,
+ 410424,
+ 410425,
+ 410426,
+ 410427,
+ 410441,
+ 410442,
+ 410470,
+ 410471,
+ 410472,
+ 410480,
+ 410481,
+ 410482,
+ 410452,
+ 410557,
+ 410558,
+ 410559,
+ 410464,
+ 410465,
+ 410466,
+ 411073,
+ 411074,
+ 411075,
+ 411076,
+ 411077,
+ 411078,
+ 411079,
+ 411080,
+ 411081,
+ 411082,
+ 411083,
+ 411084,
+ 411085,
+ 411086,
+ 411087,
+ 411088,
+ 411089,
+ 411090,
+ 411068,
+ 411069,
+ 411070,
+ 411178,
+ 411179,
+ 411180,
+ 411275,
+ 410661,
+ 410662,
+ 410663,
+ 410664,
+ 410265,
+ 410266,
+ 410267,
+ 412066,
+ 412067,
+ 412068,
+ 412069,
+ 412070,
+ 412071,
+ 412072,
+ 412073,
+ 412074,
+ 411233,
+ 411234,
+ 411316,
+ 411329,
+ 411330,
+ 411331,
+ 411332,
+ 411333,
+ 411334,
+ 411335,
+ 411336,
+ 411337,
+ 412116,
+ 412117,
+ 412123,
+ 413023,
+ 421152,
+ 421153,
+ 421154,
+ 421156,
+ 421157,
+ 421158,
+ 504329,
+ 504330,
+ 504331,
+ 504332,
+ 504333,
+ 504334,
+ 504335,
+ 504336,
+ 504338,
+ 504341,
+ 504342,
+ 504343,
+ 504344,
+ 504346,
+ 600737,
+ 600738,
+ 600791,
+ 600792,
+ 601226,
+ 601227,
+ 601239,
+ 601240,
+ 601491,
+ 601492,
+ 601495,
+ 601496,
+ 601497,
+ 601498,
+ 601783,
+ 601784,
+ 700000,
+ 700051,
+ 700052,
+ 700053,
+ 700054,
+ 700121,
+ 700122,
+ 700123,
+ 700124,
+ 700165,
+ 700166,
+ 700164,
+ 700167,
+ 700168,
+ 700205,
+ 700309,
+]
+
def HFHadronsCommonCfg(flags):
"""Heavy flavour decorations config"""
acc = ComponentAccumulator()
- mc_channel_number = int(flags.Input.RunNumber[0])
- if mc_channel_number > 0:
- if mc_channel_number in DSIDList:
- from DerivationFrameworkMCTruth.TruthDerivationToolsConfig import HadronOriginClassifierCfg
- DFCommonhadronorigintool = acc.getPrimaryAndMerge(HadronOriginClassifierCfg(flags,
- name = "DFCommonHadronOriginClassifier",
- DSID = mc_channel_number))
- from DerivationFrameworkMCTruth.TruthDerivationToolsConfig import HadronOriginDecoratorCfg
- DFCommonhadronorigindecorator = acc.getPrimaryAndMerge(HadronOriginDecoratorCfg(flags,
- name = "DFCommonHadronOriginDecorator",
- ToolName = DFCommonhadronorigintool))
- CommonAugmentation = CompFactory.DerivationFramework.CommonAugmentation
- acc.addEventAlgo(CommonAugmentation(name = "HFHadronsCommonKernel",
- AugmentationTools = [DFCommonhadronorigindecorator]))
+ if flags.Input.MCChannelNumber > 0 and flags.Input.MCChannelNumber in DSIDList:
+ from DerivationFrameworkMCTruth.TruthDerivationToolsConfig import HadronOriginClassifierCfg
+ DFCommonhadronorigintool = acc.getPrimaryAndMerge(HadronOriginClassifierCfg(flags,
+ name="DFCommonHadronOriginClassifier",
+ DSID=flags.Input.MCChannelNumber))
+ from DerivationFrameworkMCTruth.TruthDerivationToolsConfig import HadronOriginDecoratorCfg
+ DFCommonhadronorigindecorator = acc.getPrimaryAndMerge(HadronOriginDecoratorCfg(flags,
+ name="DFCommonHadronOriginDecorator",
+ ToolName=DFCommonhadronorigintool))
+ CommonAugmentation = CompFactory.DerivationFramework.CommonAugmentation
+ acc.addEventAlgo(CommonAugmentation(name="HFHadronsCommonKernel",
+ AugmentationTools=[DFCommonhadronorigindecorator]))
return acc
-
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/DecorateSUSYProcessConfig.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/DecorateSUSYProcessConfig.py
index 6c4b4e93df0ab3efa119a40c71c9a87a01fa2255..2314c27b755d15f216f5b46aeef16fd13b042f3d 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/DecorateSUSYProcessConfig.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/DecorateSUSYProcessConfig.py
@@ -7,52 +7,54 @@
def IsSUSYSignalRun3(flags):
"""Identify SUSY signal sample"""
-
if not flags.Input.isMC:
return False
-
- mc_channel_number = int(flags.Input.RunNumber[0])
# with MC16, there are no dedicated SUSY DSID blocks anymore but blocks for
# each generator: see https://twiki.cern.ch/twiki/bin/view/AtlasProtected/PmgMcSoftware#DSID_blocks
- if mc_channel_number >= 500000:
+ if flags.Input.MCChannelNumber >= 500000:
# there does not seem to be an elegant way to check whether its a SUSY sample
# or not, thus run the mark all MadGraph samples as SUSY for the moment
# to non-SUSY MG samples this adds only an empty decoration and does not break anything
- issusy = (mc_channel_number < 600000)
- print ("DecorateSUSYProcess: fileinfo.mc_channel_number", mc_channel_number, "is SUSY (aka is MG):", issusy)
+ isSUSY = flags.Input.MCChannelNumber < 600000
+ print("DecorateSUSYProcess: fileinfo.mc_channel_number",
+ flags.Input.MCChannelNumber, "is SUSY (aka is MG):", isSUSY)
# for pre-MC16 samples use the old way
else:
import os
- if not os.access('/cvmfs/atlas.cern.ch/repo/sw/Generators/MC15JobOptions/latest/share/Blocks.list',os.R_OK):
+ if not os.access('/cvmfs/atlas.cern.ch/repo/sw/Generators/MC15JobOptions/latest/share/Blocks.list', os.R_OK):
# Do it the old-fashioned way
# https://svnweb.cern.ch/trac/atlasoff/browser/Generators/MC15JobOptions/trunk/share/Blocks.list
- issusy = (370000 <= mc_channel_number < 405000) or (406000 <= mc_channel_number < 410000) \
- or (436000 <= mc_channel_number < 439000) or (448000 <= mc_channel_number < 450000)
+ isSUSY = (370000 <= flags.Input.MCChannelNumber < 405000) or (406000 <= flags.Input.MCChannelNumber < 410000) \
+ or (436000 <= flags.Input.MCChannelNumber < 439000) or (448000 <= flags.Input.MCChannelNumber < 450000)
else:
# Automatic detection based on cvmfs
- issusy = False
- blocks = open('/cvmfs/atlas.cern.ch/repo/sw/Generators/MC15JobOptions/latest/share/Blocks.list','r')
+ isSUSY = False
+ blocks = open('/cvmfs/atlas.cern.ch/repo/sw/Generators/MC15JobOptions/latest/share/Blocks.list', 'r')
for l in blocks.readlines():
- if 'SUSY' not in l: continue
- myrange = l.split()[0].replace('DSID','').replace('xxx','000',1).replace('xxx','999',1)
+ if 'SUSY' not in l:
+ continue
+ myrange = l.split()[0].replace('DSID', '').replace('xxx', '000', 1).replace('xxx', '999', 1)
low = int(myrange.split('-')[0])
- high = int(myrange.split('-')[1]) if '-' in myrange else int(myrange.replace('000','999'))
- if low <= mc_channel_number and mc_channel_number <= high:
- issusy=True
+ high = int(myrange.split('-')[1]) if '-' in myrange else int(myrange.replace('000', '999'))
+ if low <= flags.Input.MCChannelNumber and flags.Input.MCChannelNumber <= high:
+ isSUSY = True
break
- print ("DecorateSUSYProcess: fileinfo.mc_channel_number", mc_channel_number, "is SUSY:", issusy)
- return issusy
+ print("DecorateSUSYProcess: fileinfo.mc_channel_number",
+ flags.Input.MCChannelNumber, "is SUSY:", isSUSY)
+ return isSUSY
# Configure SUSY signal tagger
-def SUSYSignalTaggerCfg(flags, derivationname):
+
+
+def SUSYSignalTaggerCfg(flags, derivationName):
"""Configure SUSY signal tagger"""
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
acc = ComponentAccumulator()
if not IsSUSYSignalRun3(flags):
- print ("SUSYSignalTaggerCfg WARNING: Trying to decorate, but sample is not SUSY signal?")
- acc.addPublicTool(CompFactory.DerivationFramework.SUSYSignalTagger(name = derivationname + "SignalTagger",
- EventInfoName = "EventInfo",
- MCCollectionName = "TruthParticles"),
- primary = True)
+ print("SUSYSignalTaggerCfg WARNING: Trying to decorate, but sample is not SUSY signal?")
+ acc.addPublicTool(CompFactory.DerivationFramework.SUSYSignalTagger(name=derivationName + "SignalTagger",
+ EventInfoName="EventInfo",
+ MCCollectionName="TruthParticles"),
+ primary=True)
return acc
diff --git a/Reconstruction/RecExample/RecExOnline/share/GlobalMonitoring_CA.py b/Reconstruction/RecExample/RecExOnline/share/GlobalMonitoring_CA.py
index 84ea7c7846943d7b4d20cdbb697713fd99727a65..d612447d51a5fefd51813f49159be670d25c944d 100644
--- a/Reconstruction/RecExample/RecExOnline/share/GlobalMonitoring_CA.py
+++ b/Reconstruction/RecExample/RecExOnline/share/GlobalMonitoring_CA.py
@@ -81,8 +81,8 @@ if __name__=='__main__':
if partitionName != 'ATLAS' and partitionName != 'ATLAS_MP1':
flags.Input.ProjectName = 'data21_900GeV'
flags.Exec.MaxEvents = 20
- flags.Input.RunNumber = [431894]
- flags.Input.LumiBlockNumber = [1]
+ flags.Input.RunNumbers = [431894]
+ flags.Input.LumiBlockNumbers = [1]
flags.Common.isOnline = True
diff --git a/Reconstruction/RecJobTransforms/python/RAWtoALL_Skeleton.py b/Reconstruction/RecJobTransforms/python/RAWtoALL_Skeleton.py
index 1af50b039d12067bff4ec68dcab8d314677a1f05..8a07c7817bfddbf341c4e1dbb1ec7d9a74107833 100644
--- a/Reconstruction/RecJobTransforms/python/RAWtoALL_Skeleton.py
+++ b/Reconstruction/RecJobTransforms/python/RAWtoALL_Skeleton.py
@@ -31,8 +31,6 @@ def fromRunArgs(runArgs):
from AthenaConfiguration.AllConfigFlags import initConfigFlags
flags = initConfigFlags()
commonRunArgsToFlags(runArgs, flags)
- from RecJobTransforms.RecoConfigFlags import recoRunArgsToFlags
- recoRunArgsToFlags(runArgs, flags)
# Autoconfigure enabled subdetectors
if hasattr(runArgs, 'detectors'):
@@ -155,6 +153,10 @@ def fromRunArgs(runArgs):
flags.addFlag(f'Output.doWrite{streamName}', True)
log.info("---------- Configured "+streamName+" output")
+ # Reconstruction flags should be parsed after inputs are set
+ from RecJobTransforms.RecoConfigFlags import recoRunArgsToFlags
+ recoRunArgsToFlags(runArgs, flags)
+
from AthenaConfiguration.Enums import ProductionStep
flags.Common.ProductionStep=ProductionStep.Reconstruction
diff --git a/Reconstruction/RecJobTransforms/python/RecoConfigFlags.py b/Reconstruction/RecJobTransforms/python/RecoConfigFlags.py
index 2f100ee113b2d71720117c7d32093314d8224541..942f7db8b5032bd1b7475545cafd731c3c5db604 100644
--- a/Reconstruction/RecJobTransforms/python/RecoConfigFlags.py
+++ b/Reconstruction/RecJobTransforms/python/RecoConfigFlags.py
@@ -194,8 +194,8 @@ def printRecoFlags(flags):
def recoRunArgsToFlags(runArgs, flags):
- if hasattr(runArgs, "RunNumber"):
- flags.Input.RunNumber = runArgs.RunNumber
+ if hasattr(runArgs, "runNumber") and not flags.Input.isMC and runArgs.runNumber not in flags.Input.RunNumbers:
+ flags.Input.RunNumbers = [runArgs.runNumber]
flags.Input.OverrideRunNumber = True
if hasattr(runArgs, "projectName"):
diff --git a/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py b/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
index 57b9a7585021d3a8983eb5d0387a69f0d4bf3ddd..074a908ed103330552a395babbb8bb6b24d678e4 100755
--- a/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
+++ b/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
@@ -215,7 +215,7 @@ if __name__ == "__main__":
# included to stop segmentation error - TODO see why it's failing
flags.Input.isMC = True
flags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-14" # conditions tag for conddb (which one to use - old one for simulation)
- flags.Input.RunNumber = [284500] # run test job with and without run number and 222510
+ flags.Input.RunNumbers = [284500] # run test job with and without run number and 222510
# Finalize
flags.lock()
diff --git a/Simulation/G4Atlas/G4AtlasAlg/test/G4AtlasAlgConfig_Test.py b/Simulation/G4Atlas/G4AtlasAlg/test/G4AtlasAlgConfig_Test.py
index 23875b810e65a5cd707c8580cd80735713218b9a..369a87a4756e1ad17d8bf8066b4b326ed7f4587a 100755
--- a/Simulation/G4Atlas/G4AtlasAlg/test/G4AtlasAlgConfig_Test.py
+++ b/Simulation/G4Atlas/G4AtlasAlg/test/G4AtlasAlgConfig_Test.py
@@ -26,9 +26,9 @@ if __name__ == '__main__':
flags.Exec.SkipEvents = 0
from AthenaConfiguration.Enums import ProductionStep
flags.Common.ProductionStep = ProductionStep.Simulation
- flags.Input.RunNumber = [284500] #Isn't updating - todo: investigate
+ flags.Input.RunNumbers = [284500] #Isn't updating - todo: investigate
flags.Input.OverrideRunNumber = True
- flags.Input.LumiBlockNumber = [1]
+ flags.Input.LumiBlockNumbers = [1]
flags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1'] #defaultTestFiles.EVNT
flags.Output.HITSFileName = "myHITSnew.pool.root"
diff --git a/Simulation/ISF/ISF_Config/test/ISF_MainConfig_Test.py b/Simulation/ISF/ISF_Config/test/ISF_MainConfig_Test.py
index 9575dc4d85c1eecf38e554b0ec9e4b90962ff8b0..1617e7260836c247b2a124e07c7c0f0449ddf724 100644
--- a/Simulation/ISF/ISF_Config/test/ISF_MainConfig_Test.py
+++ b/Simulation/ISF/ISF_Config/test/ISF_MainConfig_Test.py
@@ -3,7 +3,7 @@
This test inherits from Simulation/G4Atlas/G4AtlasAlg/test/G4AtlasAlgConfig_Test.py
-Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
"""
if __name__ == '__main__':
@@ -25,12 +25,11 @@ if __name__ == '__main__':
flags.Exec.SkipEvents = 0
from AthenaConfiguration.Enums import ProductionStep
flags.Common.ProductionStep = ProductionStep.Simulation
- flags.Input.RunNumber = [284500] #Isn't updating - todo: investigate
+ flags.Input.RunNumbers = [284500] #Isn't updating - todo: investigate
flags.Input.OverrideRunNumber = True
- flags.Input.LumiBlockNumber = [1] # dummy value
+ flags.Input.LumiBlockNumbers = [1] # dummy value
from AthenaConfiguration.TestDefaults import defaultTestFiles
- inputDir = defaultTestFiles.d
flags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1'] #defaultTestFiles.EVNT
flags.Output.HITSFileName = "myHITSnew.pool.root"
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesTestHelpers.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesTestHelpers.py
index 1d49526d13e3f99bc43a2a55b2f1a573ab8ec917..dee074406bef21dcda5792d09066fa49f43ad0ac 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesTestHelpers.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesTestHelpers.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""FastCaloSimServices test helpers
-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 argparse import ArgumentParser
@@ -48,9 +48,9 @@ def defaultTestFlags(configFlags, args):
"""Fill default FCSServices flags for testing"""
from AthenaConfiguration.TestDefaults import defaultGeometryTags, defaultTestFiles
- configFlags.Input.RunNumber = [284500]
+ configFlags.Input.RunNumbers = [284500]
configFlags.Input.OverrideRunNumber = True
- configFlags.Input.LumiBlockNumber = [1]
+ configFlags.Input.LumiBlockNumbers = [1]
configFlags.Input.Files = defaultTestFiles.EVNT # ["root://eosuser.cern.ch///eos/atlas/atlascerngroupdisk/proj-simul/OutputSamples/rel21/mc16_13TeV.photon.E65536.eta20_25.EVNT.merged.pool.root"]
configFlags.Output.HITSFileName = "myHITSnew.pool.root"
configFlags.Common.ProductionStep = ProductionStep.Simulation
diff --git a/Simulation/Overlay/OverlayConfiguration/python/OverlayMetadata.py b/Simulation/Overlay/OverlayConfiguration/python/OverlayMetadata.py
index 20c9caecbcb47e9a7abb037cf7e8217613f0e1dc..974c06b35a28868ab23778b8663d5a87b0518285 100644
--- a/Simulation/Overlay/OverlayConfiguration/python/OverlayMetadata.py
+++ b/Simulation/Overlay/OverlayConfiguration/python/OverlayMetadata.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
import re
@@ -232,11 +232,14 @@ def fastChainOverlayMetadataCheck(flags):
def writeOverlayDigitizationMetadata(flags,pileupDict):
from IOVDbMetaDataTools import ParameterDbFiller
dbFiller = ParameterDbFiller.ParameterDbFiller()
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
+ runNumberEnd = flags.Input.RunNumbers[-1]
+ if runNumberEnd == runNumber:
+ runNumberEnd += 1
logger.debug('ParameterDbFiller BeginRun = %s', str(runNumber) )
dbFiller.setBeginRun(runNumber)
- logger.debug('ParameterDbFiller EndRun = %s', str(runNumber+1) )
- dbFiller.setEndRun(runNumber+1)
+ logger.debug('ParameterDbFiller EndRun = %s', str(runNumberEnd) )
+ dbFiller.setEndRun(runNumberEnd)
logger.info('Filling Digitization MetaData')
diff --git a/Simulation/SimuJobTransforms/python/CommonSimulationSteering.py b/Simulation/SimuJobTransforms/python/CommonSimulationSteering.py
index 371e200c77a9acbcf4ec7cb0ab55fe639e6deeb2..7a549ba7d55dc1424caeab1330dc57e70abd91d7 100644
--- a/Simulation/SimuJobTransforms/python/CommonSimulationSteering.py
+++ b/Simulation/SimuJobTransforms/python/CommonSimulationSteering.py
@@ -41,7 +41,7 @@ def CommonSimulationCfg(flags, log):
# For Simulation we need to override the RunNumber to pick up
# the right conditions. These next two lines are required for
# this to work.
- cfg.getService("EventSelector").FirstLB = flags.Input.LumiBlockNumber[0]
+ cfg.getService("EventSelector").FirstLB = flags.Input.LumiBlockNumbers[0]
cfg.getService("EventSelector").OverrideRunNumber = True
from AthenaKernel.EventIdOverrideConfig import EvtIdModifierSvcCfg
cfg.merge(EvtIdModifierSvcCfg(flags))
diff --git a/Simulation/SimulationConfig/python/SimConfigFlags.py b/Simulation/SimulationConfig/python/SimConfigFlags.py
index 4d3d0ca8e3904c3a789efdd65c801d98d92c0dd2..2d4f1101cdbe33e2ee0d07413416489928053b41 100644
--- a/Simulation/SimulationConfig/python/SimConfigFlags.py
+++ b/Simulation/SimulationConfig/python/SimConfigFlags.py
@@ -267,9 +267,9 @@ def createSimConfigFlags():
def simulationRunArgsToFlags(runArgs, flags):
"""Fill simulation configuration flags from run arguments."""
if hasattr(runArgs, "DataRunNumber"):
- flags.Input.RunNumber = [runArgs.DataRunNumber]
+ flags.Input.RunNumbers = [runArgs.DataRunNumber]
flags.Input.OverrideRunNumber = True
- flags.Input.LumiBlockNumber = [1] # dummy value
+ flags.Input.LumiBlockNumbers = [1] # dummy value
if hasattr(runArgs, "jobNumber"):
flags.Input.JobNumber = runArgs.jobNumber
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileCisCalibAlgConfig.py b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileCisCalibAlgConfig.py
index 5dd3e157f77f5ba87471b344790118c9b4ba4172..f0f00da4dee20d681b029ee996a031d7b0c65340 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileCisCalibAlgConfig.py
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileCisCalibAlgConfig.py
@@ -43,7 +43,7 @@ def TileCisCalibAlgCfg(flags, **kwargs):
kwargs.setdefault('name', 'TileCisCalibAlg')
kwargs.setdefault('RunType', 8)
- kwargs.setdefault('RunNumber', flags.Input.RunNumber[0])
+ kwargs.setdefault('RunNumber', flags.Input.RunNumbers[0])
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
acc = ComponentAccumulator()
@@ -89,7 +89,7 @@ if __name__=='__main__':
cfg.merge( ByteStreamReadCfg(flags, type_names = tileTypeNames) )
cfg.getService('ByteStreamCnvSvc').ROD2ROBmap = [ "-1" ]
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
from AthenaConfiguration.ComponentFactory import CompFactory
cfg.addPublicTool( CompFactory.TileROD_Decoder(fullTileMode = runNumber) )
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileDigiNoiseCalibAlgConfig.py b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileDigiNoiseCalibAlgConfig.py
index baae9535040eef26b570eaf533393070e84df73a..79d26bcaa5880ba371e4d8f9acb3b070410a68f9 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileDigiNoiseCalibAlgConfig.py
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileDigiNoiseCalibAlgConfig.py
@@ -61,7 +61,7 @@ if __name__=='__main__':
cfg.merge( ByteStreamReadCfg(flags, type_names = tileTypeNames) )
cfg.getService('ByteStreamCnvSvc').ROD2ROBmap = [ "-1" ]
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
from AthenaConfiguration.ComponentFactory import CompFactory
cfg.addPublicTool( CompFactory.TileROD_Decoder(fullTileMode = runNumber) )
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileLaserCalibAlgConfig.py b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileLaserCalibAlgConfig.py
index 004257abffb11d557b03b775f6cd7b5fe22c52cb..76f22d3596a73453b5782e604be00f29281b0da1 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileLaserCalibAlgConfig.py
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileLaserCalibAlgConfig.py
@@ -101,7 +101,7 @@ if __name__=='__main__':
cfg.merge( ByteStreamReadCfg(flags, type_names = tileTypeNames) )
cfg.getService('ByteStreamCnvSvc').ROD2ROBmap = [ "-1" ]
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
from AthenaConfiguration.ComponentFactory import CompFactory
cfg.addPublicTool( CompFactory.TileROD_Decoder(fullTileMode = runNumber) )
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileRawChNoiseCalibAlgConfig.py b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileRawChNoiseCalibAlgConfig.py
index c1e45279da68327da9d14a71ea81d967f019dde3..dd1469c637df860924d72284f80af116ef56ba86 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileRawChNoiseCalibAlgConfig.py
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileRawChNoiseCalibAlgConfig.py
@@ -74,7 +74,7 @@ if __name__=='__main__':
cfg.merge( ByteStreamReadCfg(flags, type_names = tileTypeNames) )
cfg.getService('ByteStreamCnvSvc').ROD2ROBmap = [ "-1" ]
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
from AthenaConfiguration.ComponentFactory import CompFactory
cfg.addPublicTool( CompFactory.TileROD_Decoder(fullTileMode = runNumber) )
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileTriggerCalibAlgConfig.py b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileTriggerCalibAlgConfig.py
index 65d4e53f371a314e6dc4e2a6ea62523a8fa30aa6..efdefa921a84211dbeb033ec3ef62c10c42c0358 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileTriggerCalibAlgConfig.py
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileTriggerCalibAlgConfig.py
@@ -55,7 +55,7 @@ def TileTriggerCalibAlgCfg(flags, **kwargs):
kwargs.setdefault('name', 'TileTriggerCalibAlg')
kwargs.setdefault('RunType', 8)
- kwargs.setdefault('RunNumber', flags.Input.RunNumber[0])
+ kwargs.setdefault('RunNumber', flags.Input.RunNumbers[0])
acc = ComponentAccumulator()
@@ -101,7 +101,7 @@ if __name__=='__main__':
cfg.merge( ByteStreamReadCfg(flags, type_names = tileTypeNames) )
cfg.getService('ByteStreamCnvSvc').ROD2ROBmap = [ "-1" ]
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
from AthenaConfiguration.ComponentFactory import CompFactory
cfg.addPublicTool( CompFactory.TileROD_Decoder(fullTileMode = runNumber) )
diff --git a/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py b/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py
index 0eb3203e59d1572377a7e6e7e710fec906b4f116..1e37cf9bad27bece0f0d3ababa28543f9cbbfb26 100644
--- a/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py
@@ -29,7 +29,7 @@ def TileCablingSvcCfg(flags):
geometry = flags.GeoModel.AtlasVersion
if not flags.Common.isOnline:
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
if flags.Input.OverrideRunNumber > 0:
from AthenaKernel.EventIdOverrideConfig import getMinMaxRunNumbers
runNumber = getMinMaxRunNumbers(flags)[0]
diff --git a/TileCalorimeter/TileConditions/python/TileOFCConfig.py b/TileCalorimeter/TileConditions/python/TileOFCConfig.py
index be5ce04367ffa5f6a17fcc06bb50db70fec4dfb0..2276f773e91d169c579cf2b04a70826b8563a87f 100644
--- a/TileCalorimeter/TileConditions/python/TileOFCConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileOFCConfig.py
@@ -47,7 +47,7 @@ def TileOFCCondAlgCfg(flags, **kwargs):
ofcType = ofcType + '/' + runType
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
runSplitOnline = 314449 #Use OFC stored in online folder for all runs before 2017
if flags.IOVDb.DatabaseInstance == 'CONDBR2' and runType == 'PHY' and runNumber > runSplitOnline:
ofcFolder = folders.addSplitOnline('/TILE/ONL01/FILTER/' + ofcType, '/TILE/OFL02/FILTER/' + ofcType)
diff --git a/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py b/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py
index 147661f5b3c0ec1767ec255d2aebdfc2fb3bd737..9f5fbbfae10f863df3d23dd54822e1a36ade8cf2 100644
--- a/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py
+++ b/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py
@@ -51,7 +51,7 @@ def _doOpt2ByDefault(prevFlags):
else:
return True
- runNumber = prevFlags.Input.RunNumber[0]
+ runNumber = prevFlags.Input.RunNumbers[0]
# Run Optimal Filter with iterations (Opt2) by default,
# both for cosmics and collisions data before 2011
if not prevFlags.Input.isMC and runNumber > 0 and runNumber < 171194:
@@ -105,7 +105,7 @@ def _doOptATLAS(prevFlags):
def _zeroAmplitudeWithoutDigits(prevFlags):
if not prevFlags.Input.isMC:
- runNumber = prevFlags.Input.RunNumber[0]
+ runNumber = prevFlags.Input.RunNumbers[0]
# Use OF1 corrections only for years 2015 - 2016
return runNumber > 269101 and runNumber < 324320
else:
@@ -137,7 +137,7 @@ def _getRunType(prevFlags):
def _useDCS(prevFlags):
if not (prevFlags.Common.isOnline or prevFlags.Input.isMC):
- runNumber = prevFlags.Input.RunNumber[0]
+ runNumber = prevFlags.Input.RunNumbers[0]
# Use Tile DCS only for 2011 data and later, excluding shutdown period
return (runNumber > 171194 and runNumber < 222222) or runNumber > 232498
else:
diff --git a/TileCalorimeter/TileExample/TileRecEx/python/RunTileCalibRec.py b/TileCalorimeter/TileExample/TileRecEx/python/RunTileCalibRec.py
index 13847f51ca3d6612c7e910b562aa5289814df0c3..af4ddbd741af2de566f8d8334fd5ddbd173e5e77 100755
--- a/TileCalorimeter/TileExample/TileRecEx/python/RunTileCalibRec.py
+++ b/TileCalorimeter/TileExample/TileRecEx/python/RunTileCalibRec.py
@@ -186,7 +186,7 @@ if __name__=='__main__':
if args.phys_timing and flags.Tile.RunType == 'LAS':
flags.Tile.TimingType = 'GAP/LAS'
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
# Set up LHC Run period
if not any([args.run2, args.run3]):
diff --git a/TileCalorimeter/TileExample/TileRecEx/python/RunTileTBDump.py b/TileCalorimeter/TileExample/TileRecEx/python/RunTileTBDump.py
index 880dc4481e180433ae1e073c8d805b681b2c3a84..1b37914fb6933f87d6e53e5ddbc2056961fd470b 100755
--- a/TileCalorimeter/TileExample/TileRecEx/python/RunTileTBDump.py
+++ b/TileCalorimeter/TileExample/TileRecEx/python/RunTileTBDump.py
@@ -70,7 +70,7 @@ if __name__=='__main__':
log.error('Input files must be provided! For example: --filesInput=file1,file2,... or --run RUNNUMBER')
sys.exit(-1)
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
# Set up LHC Run period
if not any([args.run2, args.run3]):
diff --git a/TileCalorimeter/TileMonitoring/python/RunTileMonitoring.py b/TileCalorimeter/TileMonitoring/python/RunTileMonitoring.py
index 4916f091bf1976a8ce39c755fcb39cb977c564b6..05d7bb31f3a622cde1091c09f4b35fa821f00cfc 100755
--- a/TileCalorimeter/TileMonitoring/python/RunTileMonitoring.py
+++ b/TileCalorimeter/TileMonitoring/python/RunTileMonitoring.py
@@ -58,7 +58,7 @@ def _configFlagsFromPartition(flags, partition, log):
flags.Beam.Type = BeamType(beamType)
flags.Input.ProjectName = projectName
- flags.Input.RunNumber = [runNumber]
+ flags.Input.RunNumbers = [runNumber]
if __name__=='__main__':
@@ -208,12 +208,12 @@ if __name__=='__main__':
inputDirectory = "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TileByteStream/TileByteStream-02-00-00"
inputFile = "data18_tilecomm.00363899.calibration_tile.daq.RAW._lb0000._TileREB-ROS._0005-200ev.data"
flags.Input.Files = [os.path.join(inputDirectory, inputFile)]
- flags.Input.RunNumber = [363899]
+ flags.Input.RunNumbers = [363899]
elif args.cis:
inputDirectory = "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TileByteStream/TileByteStream-02-00-00"
inputFile = "data18_tilecomm.00363899.calibration_tile.daq.RAW._lb0000._TileREB-ROS._0005-200ev.data"
flags.Input.Files = [os.path.join(inputDirectory, inputFile)]
- flags.Input.RunNumber = [363899]
+ flags.Input.RunNumbers = [363899]
elif args.noise:
inputDirectory = 'root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/det-tile/test'
inputFile = 'data12_8TeV.00201555.physics_ZeroBiasOverlay.merge.RAW._lb0150._SFO-ALL._0001.1'
@@ -222,7 +222,7 @@ if __name__=='__main__':
from AthenaConfiguration.TestDefaults import defaultTestFiles
flags.Input.Files = defaultTestFiles.RAW_RUN2
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
flags.GeoModel.AtlasVersion = 'ATLAS-R3S-2021-03-02-00' if not flags.Input.isMC and runNumber >= 411938 else 'ATLAS-R2-2016-01-00-01'
if not flags.Output.HISTFileName:
diff --git a/TileCalorimeter/TileMonitoring/python/TileCellMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileCellMonitorAlgorithm.py
index ed329589f3e06ff425904b56869878685c209ca7..3be73a2d5adbad52bdcbd9635ce19782c4b5ea27 100644
--- a/TileCalorimeter/TileMonitoring/python/TileCellMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileCellMonitorAlgorithm.py
@@ -69,7 +69,7 @@ def TileCellMonitoringConfig(flags, **kwargs):
for k, v in kwargs.items():
setattr(tileCellMonAlg, k, v)
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
# 1) Configure histogram with TileCellMonAlg algorithm execution time
executeTimeGroup = helper.addGroup(tileCellMonAlg, 'TileCellMonExecuteTime', 'Tile/')
diff --git a/TileCalorimeter/TileMonitoring/python/TileClusterMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileClusterMonitorAlgorithm.py
index 5f6307915f651dff9660fe61c105fe5d70767558..9b09ab4c82fe328a8629487e52d01afbfed77ec9 100644
--- a/TileCalorimeter/TileMonitoring/python/TileClusterMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileClusterMonitorAlgorithm.py
@@ -43,7 +43,7 @@ def TileClusterMonitoringConfig(flags, **kwargs):
for k, v in kwargs.items():
setattr(tileClusterMonAlg, k, v)
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
# 1) Configure histogram with TileClusterMonAlg algorithm execution time
executeTimeGroup = helper.addGroup(tileClusterMonAlg, 'TileClusterMonExecuteTime', 'Tile/')
diff --git a/TileCalorimeter/TileMonitoring/python/TileDQFragMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileDQFragMonitorAlgorithm.py
index 1f07ecfd8e78f155c33a8e8d9b1f355b0a0809cd..43c2814cc4d4242ea36249cf0827b9dea2e61775 100644
--- a/TileCalorimeter/TileMonitoring/python/TileDQFragMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileDQFragMonitorAlgorithm.py
@@ -52,7 +52,7 @@ def TileDQFragMonitoringConfig(flags, **kwargs):
from AthenaMonitoring import AthMonitorCfgHelper
helper = AthMonitorCfgHelper(flags, 'TileDQFragMonAlgCfg')
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
from AthenaConfiguration.ComponentFactory import CompFactory
_TileDQFragMonitoringCore(helper, CompFactory.TileDQFragMonitorAlgorithm,
runNumber, **kwargs)
diff --git a/TileCalorimeter/TileMonitoring/python/TileDigiNoiseMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileDigiNoiseMonitorAlgorithm.py
index 44d4b651af5a76066d3d4be1fff010aa2d4f93e4..432c8df9638a3f0d29a7fcf59e7b4edef5246862 100644
--- a/TileCalorimeter/TileMonitoring/python/TileDigiNoiseMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileDigiNoiseMonitorAlgorithm.py
@@ -56,7 +56,7 @@ def TileDigiNoiseMonitoringConfig(flags, **kwargs):
for k, v in kwargs.items():
setattr(tileDigiNoiseMonAlg, k, v)
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
# 1) Configure histogram with TileDigiNoiseMonAlg algorithm execution time
executeTimeGroup = helper.addGroup(tileDigiNoiseMonAlg, 'TileDigiNoiseMonExecuteTime', 'Tile/')
diff --git a/TileCalorimeter/TileMonitoring/python/TileDigitsFlxMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileDigitsFlxMonitorAlgorithm.py
index bbc22a2e622cf49f0a9681a2bfff566ea483bbfe..385c86ed9ee7a1110f60604bcf5717f5e45e7bbf 100644
--- a/TileCalorimeter/TileMonitoring/python/TileDigitsFlxMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileDigitsFlxMonitorAlgorithm.py
@@ -42,7 +42,7 @@ def TileDigitsFlxMonitoringConfig(flags, fragIDs=[0x201, 0x402], **kwargs):
title = 'Time for execute TileDigitsFlxMonAlg algorithm;time [#mus]',
xbins = 300, xmin = 0, xmax = 300000)
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
from TileCalibBlobObjs.Classes import TileCalibUtils as Tile
modules = []
diff --git a/TileCalorimeter/TileMonitoring/python/TileDigitsMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileDigitsMonitorAlgorithm.py
index 0de0a1ecc6bb8a3feff7abcde998b8b1060d4842..0eaabf0c846b6e338a421721a4c8deba8f4bb271 100644
--- a/TileCalorimeter/TileMonitoring/python/TileDigitsMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileDigitsMonitorAlgorithm.py
@@ -59,7 +59,7 @@ def TileDigitsMonitoringConfig(flags, **kwargs):
for k, v in kwargs.items():
setattr(tileDigitsMonAlg, k, v)
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
# 1) Configure histogram with TileDigiNoiseMonAlg algorithm execution time
executeTimeGroup = helper.addGroup(tileDigitsMonAlg, 'TileDigitsMonExecuteTime', 'Tile/')
@@ -275,7 +275,7 @@ if __name__=='__main__':
cfg.merge( ByteStreamReadCfg(flags, type_names = tileTypeNames) )
cfg.getService('ByteStreamCnvSvc').ROD2ROBmap = [ "-1" ]
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
from AthenaConfiguration.ComponentFactory import CompFactory
cfg.addPublicTool( CompFactory.TileROD_Decoder(fullTileMode = runNumber) )
diff --git a/TileCalorimeter/TileMonitoring/python/TileJetMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileJetMonitorAlgorithm.py
index 4109ffea5e3497d768ed3562a32a5e362e998d04..c67666103cf0c5ac55d3099c3e1c18d7ed064d5f 100644
--- a/TileCalorimeter/TileMonitoring/python/TileJetMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileJetMonitorAlgorithm.py
@@ -116,7 +116,7 @@ def TileJetMonitoringConfig(flags, **kwargs):
from TileMonitoring.TileMonitoringCfgHelper import addValueVsModuleAndChannelMaps, getPartitionName
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
# 2) Configure 2D histograms (profiles/maps) with Tile channel time vs module and channel per partion (DQ summary)
diff --git a/TileCalorimeter/TileMonitoring/python/TileMBTSMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileMBTSMonitorAlgorithm.py
index 668e07d04152d0a0d23cc6b4d45b871bb9f09c95..e361f4b94c3e7699084a4bf8b4ea55df74b5c173 100644
--- a/TileCalorimeter/TileMonitoring/python/TileMBTSMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileMBTSMonitorAlgorithm.py
@@ -46,7 +46,7 @@ def TileMBTSMonitoringConfig(flags, **kwargs):
from AthenaConfiguration.ComponentFactory import CompFactory
_TileMBTSMonitoringConfigCore(helper, CompFactory.TileMBTSMonitorAlgorithm,
- flags.Input.RunNumber[0],
+ flags.Input.RunNumbers[0],
flags.Beam.Type is BeamType.Cosmics,
**kwargs)
diff --git a/TileCalorimeter/TileMonitoring/python/TileMuIdMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileMuIdMonitorAlgorithm.py
index 88a4905417f9c774cb351b7e94f6be3d4c4794fc..566e05fb750ea40b98ac8283d302eea6ed8b7dcf 100644
--- a/TileCalorimeter/TileMonitoring/python/TileMuIdMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileMuIdMonitorAlgorithm.py
@@ -40,7 +40,7 @@ def TileMuIdMonitoringConfig(flags, **kwargs):
for k, v in kwargs.items():
setattr(tileMuIdMonAlg, k, v)
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
# 1) Configure histogram with TileMuIdMonAlg algorithm execution time
executeTimeGroup = helper.addGroup(tileMuIdMonAlg, 'TileMuIdMonExecuteTime', 'Tile/')
diff --git a/TileCalorimeter/TileMonitoring/python/TileMuonFitMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileMuonFitMonitorAlgorithm.py
index 93c4c37be1afbeea4aaba848b10b0fbb58af97ac..64c212f9f44de33f99402fef5c5d1ec5eefd05b6 100644
--- a/TileCalorimeter/TileMonitoring/python/TileMuonFitMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileMuonFitMonitorAlgorithm.py
@@ -37,7 +37,7 @@ def TileMuonFitMonitoringConfig(flags, **kwargs):
for k, v in kwargs.items():
setattr(tileMuonFitMonAlg, k, v)
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
# 1) Configure histogram with TileMuonFitMonAlg algorithm execution time
executeTimeGroup = helper.addGroup(tileMuonFitMonAlg, 'TileMuonFitMonExecuteTime', 'Tile/')
diff --git a/TileCalorimeter/TileMonitoring/python/TileRODMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileRODMonitorAlgorithm.py
index e72a59ec46179a8605b679b167ba3499690f0334..2cde00031f42140cb1230d7d0faca9b6e223274f 100644
--- a/TileCalorimeter/TileMonitoring/python/TileRODMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileRODMonitorAlgorithm.py
@@ -62,7 +62,7 @@ def TileRODMonitoringConfig(flags, **kwargs):
for k, v in kwargs.items():
setattr(tileRODMonAlg, k, v)
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
# Configure histogram with TileRODMonAlg algorithm execution time
executeTimeGroup = helper.addGroup(tileRODMonAlg, 'TileRODMonExecuteTime', 'Tile/')
diff --git a/TileCalorimeter/TileMonitoring/python/TileRawChannelFlxMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileRawChannelFlxMonitorAlgorithm.py
index 3fd7a2692b2d85369d333c0dcb1e33851cb08919..37eab7716585a4ce4c78496f5be686406684dec1 100644
--- a/TileCalorimeter/TileMonitoring/python/TileRawChannelFlxMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileRawChannelFlxMonitorAlgorithm.py
@@ -39,7 +39,7 @@ def TileRawChannelFlxMonitoringConfig(flags, fragIDs=[0x201, 0x402], **kwargs):
title = 'Time for execute TileRawChannelFlxMonAlg algorithm;time [#mus]',
xbins = 300, xmin = 0, xmax = 300000)
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
from TileCalibBlobObjs.Classes import TileCalibUtils as Tile
modules = []
@@ -126,7 +126,7 @@ if __name__=='__main__':
cfg.merge( ByteStreamReadCfg(flags, type_names = tileTypeNames) )
cfg.getService('ByteStreamCnvSvc').ROD2ROBmap = [ "-1" ]
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
from AthenaConfiguration.ComponentFactory import CompFactory
cfg.addPublicTool( CompFactory.TileROD_Decoder(fullTileMode = runNumber) )
diff --git a/TileCalorimeter/TileMonitoring/python/TileRawChannelMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileRawChannelMonitorAlgorithm.py
index c0a1da53954e0c1229366f18236857317941dbc5..2235d8ae49e3868a1325a63ac975922f50b279c3 100644
--- a/TileCalorimeter/TileMonitoring/python/TileRawChannelMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileRawChannelMonitorAlgorithm.py
@@ -90,7 +90,7 @@ def TileRawChannelMonitoringConfig(flags, overlapHistograms=None, **kwargs):
for k, v in kwargs.items():
setattr(tileRawChannelMonAlg, k, v)
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
# 1) Configure histogram with TileRawChannelMonAlg algorithm execution time
executeTimeGroup = helper.addGroup(tileRawChannelMonAlg, 'TileRawChannelMonExecuteTime', 'Tile/')
@@ -246,7 +246,7 @@ if __name__=='__main__':
cfg.merge( ByteStreamReadCfg(flags, type_names = tileTypeNames) )
cfg.getService('ByteStreamCnvSvc').ROD2ROBmap = [ "-1" ]
- runNumber = flags.Input.RunNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
from AthenaConfiguration.ComponentFactory import CompFactory
cfg.addPublicTool( CompFactory.TileROD_Decoder(fullTileMode = runNumber) )
diff --git a/TileCalorimeter/TileMonitoring/python/TileRawChannelNoiseMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileRawChannelNoiseMonitorAlgorithm.py
index d65cea70c661da4e90a10cc8f9b27d451a2be999..9ab772c2ba78caf910693268250a0fe2f2937aef 100644
--- a/TileCalorimeter/TileMonitoring/python/TileRawChannelNoiseMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileRawChannelNoiseMonitorAlgorithm.py
@@ -52,7 +52,7 @@ def TileRawChannelNoiseMonitoringConfig(flags, **kwargs):
for k, v in kwargs.items():
setattr(tileRawChanNoiseMonAlg, k, v)
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
# 1) Configure histogram with TileRawChanNoiseMonAlg algorithm execution time
executeTimeGroup = helper.addGroup(tileRawChanNoiseMonAlg, 'TileRawChanNoiseMonExecuteTime', 'Tile/')
diff --git a/TileCalorimeter/TileMonitoring/python/TileRawChannelTimeMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileRawChannelTimeMonitorAlgorithm.py
index c808347aa961ac8e5da16148f59c43337ed5ecbc..557b0305320180a1e645545ab0e299806eb05399 100644
--- a/TileCalorimeter/TileMonitoring/python/TileRawChannelTimeMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileRawChannelTimeMonitorAlgorithm.py
@@ -42,7 +42,7 @@ def TileRawChannelTimeMonitoringConfig(flags, **kwargs):
kwargs.setdefault('PartitionTimeDiffferncePairs', partitionPairs)
partitionTimeCorrections = [0, 0, 0, 0]
- if flags.Input.RunNumber[0] > 400000: # Update partition time corrections for Run 3
+ if flags.Input.RunNumbers[0] > 400000: # Update partition time corrections for Run 3
if 'LAS' in flags.Tile.RunType:
partitionTimeCorrections = [-28.65, -45.2, 25.24, 24.94]
elif 'CIS' in flags.Tile.RunType:
@@ -65,7 +65,7 @@ def TileRawChannelTimeMonitoringConfig(flags, **kwargs):
for k, v in kwargs.items():
setattr(tileRawChanTimeMonAlg, k, v)
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
eventsType = 'CIS' if 'CIS' in flags.Tile.RunType else 'Laser'
# 1) Configure histogram with TileRawChannelTimeMonAlg algorithm execution time
diff --git a/TileCalorimeter/TileMonitoring/python/TileTBBeamMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileTBBeamMonitorAlgorithm.py
index 11927106e0e0ce805d3b9d0e490ec925f90cc003..622e2dc7ba97db96f4a04fe41cb9149c85b7053a 100644
--- a/TileCalorimeter/TileMonitoring/python/TileTBBeamMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileTBBeamMonitorAlgorithm.py
@@ -55,7 +55,7 @@ def TileTBBeamMonitoringConfig(flags, fragIDs=[0x100,0x101,0x200,0x201,0x402], *
for k, v in kwargs.items():
setattr(tileTBBeamMonAlg, k, v)
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
# Configure histogram with TileTBBeamMonAlg algorithm execution time
executeTimeGroup = helper.addGroup(tileTBBeamMonAlg, 'TileTBBeamMonExecuteTime', 'TestBeam')
@@ -274,7 +274,7 @@ if __name__=='__main__':
rawChannels = args.channels
cells = args.cells
if flags.Input.Format is Format.BS:
- cfg.addPublicTool(CompFactory.TileROD_Decoder(fullTileMode=flags.Input.RunNumber[0]))
+ cfg.addPublicTool(CompFactory.TileROD_Decoder(fullTileMode=flags.Input.RunNumbers[0]))
from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
tileTypeNames = [f'TileDigitsContainer/{args.digits}',
diff --git a/TileCalorimeter/TileMonitoring/python/TileTBMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileTBMonitorAlgorithm.py
index 8eeee0814e84b85336b70005b7f77c60e5c4ea13..6f4ef11e44406039492518b4b2e56af715098cd8 100644
--- a/TileCalorimeter/TileMonitoring/python/TileTBMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileTBMonitorAlgorithm.py
@@ -63,7 +63,7 @@ def TileTBMonitoringConfig(flags, fragIDs=[0x100, 0x101, 0x200, 0x201, 0x402], *
for k, v in kwargs.items():
setattr(tileTBMonAlg, k, v)
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
# Configure histogram with TileTBMonAlg algorithm execution time
executeTimeGroup = helper.addGroup(tileTBMonAlg, 'TileTBMonExecuteTime', 'TestBeam')
@@ -265,7 +265,7 @@ if __name__ == '__main__':
rawChannels = args.channels
cells = args.cells
if flags.Input.Format is Format.BS:
- cfg.addPublicTool(CompFactory.TileROD_Decoder(fullTileMode=flags.Input.RunNumber[0]))
+ cfg.addPublicTool(CompFactory.TileROD_Decoder(fullTileMode=flags.Input.RunNumbers[0]))
from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
tileTypeNames = [f'TileDigitsContainer/{args.digits}', 'TileRawChannelContainer/TileRawChannelCnt']
diff --git a/TileCalorimeter/TileMonitoring/python/TileTBPulseMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileTBPulseMonitorAlgorithm.py
index 455427a217263454595c273fd168e55409723942..32c6010b18683eadd943c0b681f1086d87526c63 100644
--- a/TileCalorimeter/TileMonitoring/python/TileTBPulseMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileTBPulseMonitorAlgorithm.py
@@ -102,7 +102,7 @@ def TileTBPulseMonitoringConfig(flags, timeRange=[-100, 100], fragIDs=[0x100, 0x
for k, v in kwargs.items():
setattr(tileTBPulseMonAlg, k, v)
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
# Configure histogram with TileTBPulseMonAlg algorithm execution time
executeTimeGroup = helper.addGroup(tileTBPulseMonAlg, 'TileTBPulseMonExecuteTime', 'TestBeam')
@@ -211,7 +211,7 @@ if __name__=='__main__':
rawChannels = args.channels
if flags.Input.Format is Format.BS:
- cfg.addPublicTool(CompFactory.TileROD_Decoder(fullTileMode=flags.Input.RunNumber[0]))
+ cfg.addPublicTool(CompFactory.TileROD_Decoder(fullTileMode=flags.Input.RunNumbers[0]))
from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
tileTypeNames = [f'TileDigitsContainer/{args.digits}', 'TileRawChannelContainer/TileRawChannelCnt']
diff --git a/TileCalorimeter/TileMonitoring/python/TileTMDBDigitsMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileTMDBDigitsMonitorAlgorithm.py
index 7f60517e63bd77d018b677500eb19c12f0224fba..44a8d865a709f84a9c4a233984420cbe6a2f4e0f 100644
--- a/TileCalorimeter/TileMonitoring/python/TileTMDBDigitsMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileTMDBDigitsMonitorAlgorithm.py
@@ -25,7 +25,7 @@ def TileTMDBDigitsMonitoringConfig(flags):
tileTMDBDigitsMonAlg.TriggerChain = ''
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
from TileMonitoring.TileMonitoringCfgHelper import addTileTMDB_1DHistogramsArray, addTileTMDB_2DHistogramsArray
diff --git a/TileCalorimeter/TileMonitoring/python/TileTMDBMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileTMDBMonitorAlgorithm.py
index a1186dafe2841c8bf7aa2d60cf1f1f786da7882e..76961e1818c06bd3d0f320aca99294f9bc524292 100644
--- a/TileCalorimeter/TileMonitoring/python/TileTMDBMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileTMDBMonitorAlgorithm.py
@@ -64,7 +64,7 @@ def TileTMDBMonitoringConfig(flags, **kwargs):
for k, v in kwargs.items():
setattr(tileTMDBMonAlg, k, v)
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
# Configure histogram with TileTMDBMonAlg algorithm execution time
executeTimeGroup = helper.addGroup(tileTMDBMonAlg, 'TileTMDBMonExecuteTime', 'Tile/')
diff --git a/TileCalorimeter/TileMonitoring/python/TileTMDBRawChannelMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileTMDBRawChannelMonitorAlgorithm.py
index 8ee8e3948f73565b938381f3f815785603cfda27..b648fea9dbbf106570900541c6559a917d47eba8 100644
--- a/TileCalorimeter/TileMonitoring/python/TileTMDBRawChannelMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileTMDBRawChannelMonitorAlgorithm.py
@@ -79,7 +79,7 @@ def TileTMDBRawChannelMonitoringConfig(flags, MuRcvRawChCnt = "MuRcvRawChCnt", F
tileTMDBRawChanMonAlg.FillRawChannelHistograms = FillRawChannelHistograms
topPath = 'Tile/TMDBRawChannel/DSP' if isDSP else 'Tile/TMDBRawChannel'
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
if FillRawChannelHistograms:
diff --git a/TileCalorimeter/TileMonitoring/python/TileTowerMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileTowerMonitorAlgorithm.py
index a7882c3e4c73a698881cf2aac4285e18f17b7e7f..cec727dbccbbbdb8f941a59ff4ceb71fce69df9d 100644
--- a/TileCalorimeter/TileMonitoring/python/TileTowerMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileTowerMonitorAlgorithm.py
@@ -40,7 +40,7 @@ def TileTowerMonitoringConfig(flags, **kwargs):
for k, v in kwargs.items():
setattr(tileTowerMonAlg, k, v)
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
# 1) Configure histogram with TileTowerMonAlg algorithm execution time
executeTimeGroup = helper.addGroup(tileTowerMonAlg, 'TileTowerMonExecuteTime', 'Tile/')
diff --git a/TileCalorimeter/TileRec/python/TileAANtupleConfig.py b/TileCalorimeter/TileRec/python/TileAANtupleConfig.py
index 9977f6095b6365591c961a496daadfa1ce056337..e574c9be762003cce6d72cca9c749542f042b8e3 100644
--- a/TileCalorimeter/TileRec/python/TileAANtupleConfig.py
+++ b/TileCalorimeter/TileRec/python/TileAANtupleConfig.py
@@ -72,7 +72,7 @@ def TileAANtupleCfg(flags, outputFile='', saveTMDB=True, **kwargs):
acc.merge( TileDQstatusAlgCfg(flags) )
if not outputFile:
- run = str(flags.Input.RunNumber[0])
+ run = str(flags.Input.RunNumbers[0])
outputFile = 'tile_{}.aan.root'.format(run)
histsvc = CompFactory.THistSvc()
histsvc.Output += ["%s DATAFILE='%s' OPT='RECREATE'" % ('AANT', outputFile)]
@@ -118,7 +118,7 @@ if __name__=='__main__':
if flags.Input.Format is Format.BS:
- cfg.addPublicTool(CompFactory.TileROD_Decoder(fullTileMode=flags.Input.RunNumber[0]))
+ cfg.addPublicTool(CompFactory.TileROD_Decoder(fullTileMode=flags.Input.RunNumbers[0]))
from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
tileTypeNames = ['TileDigitsContainer/TileDigitsCnt',
diff --git a/Tools/Campaigns/python/MC16.py b/Tools/Campaigns/python/MC16.py
index 046f9f19b02749818d726b24dad75b0859e9a0f1..4fc1bc3db76473866ce80653c5bf45e5fe55882e 100644
--- a/Tools/Campaigns/python/MC16.py
+++ b/Tools/Campaigns/python/MC16.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 Campaigns.Utils import Campaign
@@ -82,9 +82,9 @@ def MC16SimulationSingleIoV(flags):
"""MC16 flags for Simulation"""
MC16SimulationNoIoV(flags)
- flags.Input.RunNumber = [284500]
+ flags.Input.RunNumbers = [284500]
flags.Input.OverrideRunNumber = True
- flags.Input.LumiBlockNumber = [1] # dummy value
+ flags.Input.LumiBlockNumbers = [1] # dummy value
def MC16Simulation(flags):
diff --git a/Tools/Campaigns/python/MC21.py b/Tools/Campaigns/python/MC21.py
index 63d47b3e45b16aa56b5d724f37413be056587c9a..dd15edd8d76ab1ec1372f44b61d757ebef36267e 100644
--- a/Tools/Campaigns/python/MC21.py
+++ b/Tools/Campaigns/python/MC21.py
@@ -118,18 +118,18 @@ def MC21SimulationLowMuRun(flags):
"""MC21 flags for low mu run simulation"""
MC21SimulationNoIoV(flags)
- flags.Input.RunNumber = [420000]
+ flags.Input.RunNumbers = [420000]
flags.Input.OverrideRunNumber = True
- flags.Input.LumiBlockNumber = [1] # dummy value
+ flags.Input.LumiBlockNumbers = [1] # dummy value
def MC21SimulationSingleIoV(flags):
"""MC21 flags for simulation"""
MC21SimulationNoIoV(flags)
- flags.Input.RunNumber = [410000]
+ flags.Input.RunNumbers = [410000]
flags.Input.OverrideRunNumber = True
- flags.Input.LumiBlockNumber = [1] # dummy value
+ flags.Input.LumiBlockNumbers = [1] # dummy value
def MC21Simulation(flags):
diff --git a/Tools/Campaigns/python/MC23.py b/Tools/Campaigns/python/MC23.py
index bab737bf7e7daaa78a33eef6137f1e49220e6489..36facc503000d571a66cef9b000d8dc045d25293 100644
--- a/Tools/Campaigns/python/MC23.py
+++ b/Tools/Campaigns/python/MC23.py
@@ -211,9 +211,9 @@ def MC23SimulationLowMuRun(flags):
"""MC23 flags for low mu run simulation"""
MC23SimulationNoIoV(flags)
- flags.Input.RunNumber = [420000]
+ flags.Input.RunNumbers = [420000]
flags.Input.OverrideRunNumber = True
- flags.Input.LumiBlockNumber = [1] # dummy value
+ flags.Input.LumiBlockNumbers = [1] # dummy value
def MC23cSimulationNoIoV(flags):
@@ -226,18 +226,18 @@ def MC23SimulationSingleIoV(flags):
"""MC23 flags for simulation"""
MC23SimulationNoIoV(flags)
- flags.Input.RunNumber = [410000]
+ flags.Input.RunNumbers = [410000]
flags.Input.OverrideRunNumber = True
- flags.Input.LumiBlockNumber = [1] # dummy value
+ flags.Input.LumiBlockNumbers = [1] # dummy value
def MC23cSimulationSingleIoV(flags):
"""MC23 flags for simulation"""
MC23SimulationNoIoV(flags)
- flags.Input.RunNumber = [450000]
+ flags.Input.RunNumbers = [450000]
flags.Input.OverrideRunNumber = True
- flags.Input.LumiBlockNumber = [1] # dummy value
+ flags.Input.LumiBlockNumbers = [1] # dummy value
def MC23aSimulationMultipleIoV(flags):
diff --git a/Tools/Campaigns/python/PhaseII.py b/Tools/Campaigns/python/PhaseII.py
index bc604895aed4137b65a490b767e191316439b410..087bdbc083d0e9efd7b5364e7284313883ac5a40 100644
--- a/Tools/Campaigns/python/PhaseII.py
+++ b/Tools/Campaigns/python/PhaseII.py
@@ -144,9 +144,9 @@ def PhaseIISimulationSingleIoV(flags):
"""Phase-II Upgrade / Run 4 flags for simulation"""
PhaseIISimulationNoIoV(flags)
- flags.Input.RunNumber = [242000]
+ flags.Input.RunNumbers = [242000]
flags.Input.OverrideRunNumber = True
- flags.Input.LumiBlockNumber = [1] # dummy value
+ flags.Input.LumiBlockNumbers = [1] # dummy value
def PhaseIISimulation(flags):
@@ -280,9 +280,9 @@ def MC23PhaseIISimulationSingleIoV(flags):
"""Phase-II Upgrade / Run 4 flags for simulation"""
MC23PhaseIISimulationNoIoV(flags)
- flags.Input.RunNumber = [350000]
+ flags.Input.RunNumbers = [350000]
flags.Input.OverrideRunNumber = True
- flags.Input.LumiBlockNumber = [1] # dummy value
+ flags.Input.LumiBlockNumbers = [1] # dummy value
def MC23PhaseIISimulation(flags):
diff --git a/Tracking/Acts/ActsGeantFollowing/share/ActsGeantFollowing_jobOptions_ITk.py b/Tracking/Acts/ActsGeantFollowing/share/ActsGeantFollowing_jobOptions_ITk.py
index e4b409a90999d3c062836f1d2778995acfb8a4fa..c5a68c10fe0bf428cbfdfb5ddd7e9f230e24fd4e 100644
--- a/Tracking/Acts/ActsGeantFollowing/share/ActsGeantFollowing_jobOptions_ITk.py
+++ b/Tracking/Acts/ActsGeantFollowing/share/ActsGeantFollowing_jobOptions_ITk.py
@@ -58,7 +58,7 @@ def defaultTestFlags(flags, args):
flags.Sim.ISFRun = False
flags.Sim.BeamPipeSimMode = BeamPipeSimMode.FastSim
- flags.Input.RunNumber = [284500]
+ flags.Input.RunNumbers = [284500]
flags.Input.OverrideRunNumber = True
flags.Input.LumiBlockNumbers = [1]
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
index 763a7ed190a6c1609b81ee6d71ac58f83979c277..12581ec98a373939001cf63a3b4fd1b05d5ddb1f 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
@@ -86,8 +86,8 @@ def getTrigConfigFromFlag( flags ):
smk, l1psk, hltpsk, bgsk = (int(k) if k!="" else None for k in (smk, l1psk, hltpsk, bgsk))
if source == "DB" and (smk is None or l1psk is None or hltpsk is None or bgsk is None):
- runNumber = flags.Input.RunNumber[0]
- lbNumber = flags.Input.LumiBlockNumber[0]
+ runNumber = flags.Input.RunNumbers[0]
+ lbNumber = flags.Input.LumiBlockNumbers[0]
if dbconn == "":
dbconn = getTrigConfFromCool(runNumber, lbNumber)["DB"]
if dbconn in ["TRIGGERDB_RUN3", "TRIGGERDBDEV1_I8", "TRIGGERDBDEV1", "TRIGGERDBDEV2"]:
@@ -216,8 +216,8 @@ def L1ConfigSvcCfg( flags ):
if cfg["SOURCE"] == "FILE":
if _doMenuConversion(flags):
# Save the menu in JSON format
- dbKeys = createJsonMenuFiles(run = flags.Input.RunNumber[0],
- lb = flags.Input.LumiBlockNumber[0])
+ dbKeys = createJsonMenuFiles(run = flags.Input.RunNumbers[0],
+ lb = flags.Input.LumiBlockNumbers[0])
l1ConfigSvc.SMK = dbKeys['SMK']
l1ConfigSvc.InputType = "FILE"
@@ -247,8 +247,8 @@ def HLTConfigSvcCfg( flags ):
if cfg["SOURCE"] == "FILE":
if _doMenuConversion(flags):
# Save the menu in JSON format
- dbKeys = createJsonMenuFiles(run = flags.Input.RunNumber[0],
- lb = flags.Input.LumiBlockNumber[0])
+ dbKeys = createJsonMenuFiles(run = flags.Input.RunNumbers[0],
+ lb = flags.Input.LumiBlockNumbers[0])
hltConfigSvc.SMK = dbKeys['SMK']
hltConfigSvc.InputType = "FILE"
@@ -301,8 +301,8 @@ def L1PrescaleCondAlgCfg( flags ):
l1PrescaleCondAlg.Filename = getL1PrescalesSetFileName( flags )
if _doMenuConversion(flags):
# Save the menu in JSON format
- dbKeys = createJsonMenuFiles(run = flags.Input.RunNumber[0],
- lb = flags.Input.LumiBlockNumber[0])
+ dbKeys = createJsonMenuFiles(run = flags.Input.RunNumbers[0],
+ lb = flags.Input.LumiBlockNumbers[0])
l1PrescaleCondAlg.L1Psk = dbKeys['L1PSK']
else:
raise RuntimeError("trigger configuration flag 'trigConfig' starts with %s, which is not understood" % tc["SOURCE"])
@@ -327,8 +327,8 @@ def BunchGroupCondAlgCfg( flags ):
bunchGroupCondAlg.Filename = getBunchGroupSetFileName( flags )
if _doMenuConversion(flags):
# Save the menu in JSON format
- dbKeys = createJsonMenuFiles(run = flags.Input.RunNumber[0],
- lb = flags.Input.LumiBlockNumber[0])
+ dbKeys = createJsonMenuFiles(run = flags.Input.RunNumbers[0],
+ lb = flags.Input.LumiBlockNumbers[0])
bunchGroupCondAlg.BGSK = dbKeys['BGSK']
else:
raise RuntimeError("trigger configuration flag 'trigConfig' starts with %s, which is not understood" % tc["SOURCE"])
@@ -359,8 +359,8 @@ def HLTPrescaleCondAlgCfg( flags ):
hltPrescaleCondAlg.Filename = getHLTPrescalesSetFileName( flags )
if _doMenuConversion(flags):
# Save the menu in JSON format
- dbKeys = createJsonMenuFiles(run = flags.Input.RunNumber[0],
- lb = flags.Input.LumiBlockNumber[0])
+ dbKeys = createJsonMenuFiles(run = flags.Input.RunNumbers[0],
+ lb = flags.Input.LumiBlockNumbers[0])
hltPrescaleCondAlg.HLTPsk = dbKeys['HLTPSK']
else:
raise RuntimeError("trigger configuration flag 'trigConfig' starts with %s, which is not understood" % tc["SOURCE"])
diff --git a/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisFullMenu.py b/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisFullMenu.py
index 5055ea8a30ce8382fb538f50db2ece14f29d5a96..00678bfc76f1b372e83884cf45dd864b1b0b2af4 100755
--- a/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisFullMenu.py
+++ b/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisFullMenu.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
#
if __name__=='__main__':
@@ -82,7 +82,7 @@ if __name__=='__main__':
fEff = amiTool.filterEfficiency
ebw = CompFactory.EnhancedBiasWeighter('EnhancedBiasRatesTool')
- ebw.RunNumber = ConfigFlags.Input.RunNumber[0]
+ ebw.RunNumber = ConfigFlags.Input.RunNumbers[0]
ebw.UseBunchCrossingData = useBunchCrossingData
ebw.IsMC = ConfigFlags.Input.isMC
# The following three are only needed if isMC == true
diff --git a/Trigger/TrigCost/RatesAnalysis/share/RatesEmulationExample.py b/Trigger/TrigCost/RatesAnalysis/share/RatesEmulationExample.py
index 7347918a974389e0dd1dba2927a4e502b4048e2d..82e90097c3ee408951dc83292d641940da5fb055 100755
--- a/Trigger/TrigCost/RatesAnalysis/share/RatesEmulationExample.py
+++ b/Trigger/TrigCost/RatesAnalysis/share/RatesEmulationExample.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
#
if __name__=='__main__':
@@ -76,7 +76,7 @@ if __name__=='__main__':
fEff = amiTool.filterEfficiency
ebw = CompFactory.EnhancedBiasWeighter('EnhancedBiasRatesTool')
- ebw.RunNumber = ConfigFlags.Input.RunNumber[0]
+ ebw.RunNumber = ConfigFlags.Input.RunNumbers[0]
ebw.UseBunchCrossingData = useBunchCrossingData
ebw.IsMC = ConfigFlags.Input.isMC
# The following three are only needed if isMC == true
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
index 1b859470f28f821d4857288fd924bf723e2d4ed1..103b5433e86624c4f5b2b5f84058a007390983f9 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
@@ -291,7 +291,7 @@ def createTriggerFlags(doTriggerRecoFlags):
# RAW: check if keys are in COOL
elif flags.Input.Format is Format.BS:
from TrigConfigSvc.TriggerConfigAccess import getKeysFromCool
- keys = getKeysFromCool(flags.Input.RunNumber[0], lbNr = 1) # currently only checking first file
+ keys = getKeysFromCool(flags.Input.RunNumbers[0], lbNr = 1) # currently only checking first file
return ( (['L1'] if 'L1PSK' in keys else []) +
(['HLT'] if 'HLTPSK' in keys else []) )
# POOL: metadata (do not distinguish L1/HLT yet, see discussions on GitLab commit f83ae2bc)
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 755e37a0a2824105dbbfe291301173cbec5c503d..29658a33f27ccf49b6d69159deac6587a83a4424 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -139,8 +139,8 @@ import TriggerJobOpts.Modifiers
if len(athenaCommonFlags.FilesInput())>0:
flags.Input.Files = athenaCommonFlags.FilesInput()
flags.Common.isOnline = not flags.Input.isMC
- TriggerJobOpts.Modifiers._run_number = flags.Input.RunNumber[0]
- TriggerJobOpts.Modifiers._lb_number = flags.Input.LumiBlockNumber[0]
+ TriggerJobOpts.Modifiers._run_number = flags.Input.RunNumbers[0]
+ TriggerJobOpts.Modifiers._lb_number = flags.Input.LumiBlockNumbers[0]
# athenaHLT: most flags are already set
else:
flags.IOVDb.DatabaseInstance = 'CONDBR2'
diff --git a/graphics/EventDisplaysOnline/share/EventDisplay_jobOptions.py b/graphics/EventDisplaysOnline/share/EventDisplay_jobOptions.py
index c91bab73eafac12298fc4095fd6a177ab1218b4b..18468812195a171f9f5a3c3d4aec67879526196a 100644
--- a/graphics/EventDisplaysOnline/share/EventDisplay_jobOptions.py
+++ b/graphics/EventDisplaysOnline/share/EventDisplay_jobOptions.py
@@ -177,7 +177,7 @@ elif beamType == 'collisions':
jobproperties.Beam.bunchSpacing.set_Value_and_Lock(25) # Needed for collisions
if (partitionName != 'ATLAS'): # Can't get some information from the test partition
- ConfigFlags.Input.RunNumber = [412343]
+ ConfigFlags.Input.RunNumbers = [412343]
ConfigFlags.Input.ProjectName = 'data23_13p6TeV'
## ERROR Missing ROBFragment with ID 0x760001 requested ATR-24151 13 Oct 2021 lshi
ConfigFlags.Trigger.L1.doMuon=False;