Skip to content
Snippets Groups Projects
Commit 1e93f16e authored by John Derek Chapman's avatar John Derek Chapman Committed by Walter Lampl
Browse files

Replace usage of ConfigFlags.Input.InitialTimeStamp with ConfigFlags.Input.TimeStamp

parent 3fa95bf7
No related branches found
No related tags found
No related merge requests found
Showing
with 23 additions and 21 deletions
...@@ -59,7 +59,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags ...@@ -59,7 +59,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles from AthenaConfiguration.TestDefaults import defaultTestFiles
ConfigFlags.Input.Files = defaultTestFiles.RDO ConfigFlags.Input.Files = defaultTestFiles.RDO
ConfigFlags.addFlag("Input.InitialTimeStamp", 1000) ConfigFlags.Input.TimeStamp = 1000
ConfigFlags.Detector.GeometryLAr = True ConfigFlags.Detector.GeometryLAr = True
ConfigFlags.Detector.GeometryTile = True ConfigFlags.Detector.GeometryTile = True
ConfigFlags.needFlagsCategory('Tile') ConfigFlags.needFlagsCategory('Tile')
......
...@@ -145,7 +145,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags ...@@ -145,7 +145,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles from AthenaConfiguration.TestDefaults import defaultTestFiles
ConfigFlags.Input.Files = defaultTestFiles.RDO ConfigFlags.Input.Files = defaultTestFiles.RDO
ConfigFlags.addFlag("Input.InitialTimeStamp", 1000) ConfigFlags.Input.TimeStamp = 1000
ConfigFlags.Detector.GeometryLAr = True ConfigFlags.Detector.GeometryLAr = True
ConfigFlags.Detector.GeometryTile = True ConfigFlags.Detector.GeometryTile = True
ConfigFlags.needFlagsCategory('Tile') ConfigFlags.needFlagsCategory('Tile')
......
...@@ -80,7 +80,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags ...@@ -80,7 +80,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles from AthenaConfiguration.TestDefaults import defaultTestFiles
ConfigFlags.Input.Files = defaultTestFiles.RDO ConfigFlags.Input.Files = defaultTestFiles.RDO
ConfigFlags.addFlag("Input.InitialTimeStamp", 1000) ConfigFlags.Input.TimeStamp = 1000
ConfigFlags.Detector.GeometryLAr = True ConfigFlags.Detector.GeometryLAr = True
ConfigFlags.Detector.GeometryTile = True ConfigFlags.Detector.GeometryTile = True
ConfigFlags.needFlagsCategory('Tile') ConfigFlags.needFlagsCategory('Tile')
......
...@@ -50,7 +50,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags ...@@ -50,7 +50,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles from AthenaConfiguration.TestDefaults import defaultTestFiles
ConfigFlags.Input.Files = defaultTestFiles.RDO ConfigFlags.Input.Files = defaultTestFiles.RDO
ConfigFlags.addFlag("Input.InitialTimeStamp", 1000) ConfigFlags.Input.TimeStamp = 1000
ConfigFlags.lock() ConfigFlags.lock()
from AthenaConfiguration.MainServicesConfig import MainServicesCfg from AthenaConfiguration.MainServicesConfig import MainServicesCfg
......
...@@ -93,7 +93,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags ...@@ -93,7 +93,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles from AthenaConfiguration.TestDefaults import defaultTestFiles
ConfigFlags.Input.Files = defaultTestFiles.RDO ConfigFlags.Input.Files = defaultTestFiles.RDO
ConfigFlags.addFlag("Input.InitialTimeStamp", 1000) ConfigFlags.Input.TimeStamp = 1000
ConfigFlags.lock() ConfigFlags.lock()
from AthenaConfiguration.MainServicesConfig import MainServicesCfg from AthenaConfiguration.MainServicesConfig import MainServicesCfg
......
...@@ -20,8 +20,10 @@ def McEventSelectorCfg(configFlags, **kw): ...@@ -20,8 +20,10 @@ def McEventSelectorCfg(configFlags, **kw):
if isinstance(rn, type([])): if isinstance(rn, type([])):
rn = rn[0] rn = rn[0]
evSel.RunNumber = rn evSel.RunNumber = rn
evSel.InitialTimeStamp = configFlags.Input.TimeStamp tstamp = configFlags.Input.TimeStamp
if isinstance(tstamp, type([])):
tstamp = tstamp[0]
evSel.InitialTimeStamp = tstamp
for k, v in kw.items(): for k, v in kw.items():
setattr (evSel, k, v) setattr (evSel, k, v)
cfg.addService(evSel) cfg.addService(evSel)
......
...@@ -25,7 +25,7 @@ if __name__=="__main__": ...@@ -25,7 +25,7 @@ if __name__=="__main__":
ConfigFlags.Input.isMC = False ConfigFlags.Input.isMC = False
ConfigFlags.Input.ProjectName = "data12_8TeV" ConfigFlags.Input.ProjectName = "data12_8TeV"
ConfigFlags.Input.RunNumber = 215643 ConfigFlags.Input.RunNumber = 215643
ConfigFlags.addFlag("Input.InitialTimeStamp", 1354748400) # LB 469 of run 215643, 2012-12-05 @ 11:00pm (UTC) ConfigFlags.Input.TimeStamp = 1354748400 # LB 469 of run 215643, 2012-12-05 @ 11:00pm (UTC)
ConfigFlags.IOVDb.GlobalTag = "COMCOND-BLKPA-RUN1-09" ConfigFlags.IOVDb.GlobalTag = "COMCOND-BLKPA-RUN1-09"
ConfigFlags.IOVDb.DatabaseInstance = "COMP200" ConfigFlags.IOVDb.DatabaseInstance = "COMP200"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R1-2012-03-00-00" ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R1-2012-03-00-00"
......
...@@ -26,7 +26,7 @@ if __name__=="__main__": ...@@ -26,7 +26,7 @@ if __name__=="__main__":
ConfigFlags.Input.isMC = False ConfigFlags.Input.isMC = False
ConfigFlags.Input.ProjectName = "data17_13TeV" ConfigFlags.Input.ProjectName = "data17_13TeV"
ConfigFlags.Input.RunNumber = [310809] ConfigFlags.Input.RunNumber = [310809]
ConfigFlags.addFlag("Input.InitialTimeStamp", 1476741326) # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC) ConfigFlags.Input.TimeStamp = 1476741326 # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC)
ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-06" ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-06"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
ConfigFlags.Detector.GeometrySCT = True ConfigFlags.Detector.GeometrySCT = True
......
...@@ -25,7 +25,7 @@ if __name__=="__main__": ...@@ -25,7 +25,7 @@ if __name__=="__main__":
ConfigFlags.Input.isMC = True ConfigFlags.Input.isMC = True
ConfigFlags.Input.ProjectName = "mc16_13TeV" ConfigFlags.Input.ProjectName = "mc16_13TeV"
ConfigFlags.Input.RunNumber = 310000 # MC16e 2018 run number ConfigFlags.Input.RunNumber = 310000 # MC16e 2018 run number
ConfigFlags.addFlag("Input.InitialTimeStamp", 1550000000) # MC16e 2018 time stamp ConfigFlags.Input.TimeStamp = 1550000000 # MC16e 2018 time stamp
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-RUN2-01" ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-RUN2-01"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
ConfigFlags.Detector.GeometrySCT = True ConfigFlags.Detector.GeometrySCT = True
......
...@@ -25,7 +25,7 @@ if __name__=="__main__": ...@@ -25,7 +25,7 @@ if __name__=="__main__":
ConfigFlags.Input.isMC = False ConfigFlags.Input.isMC = False
ConfigFlags.Input.ProjectName = "data16_13TeV" ConfigFlags.Input.ProjectName = "data16_13TeV"
ConfigFlags.Input.RunNumber = 310809 ConfigFlags.Input.RunNumber = 310809
ConfigFlags.addFlag("Input.InitialTimeStamp", 1476741326) # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC) ConfigFlags.Input.TimeStamp = 1476741326 # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC)
ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-06" ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-06"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00" ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
ConfigFlags.Detector.GeometrySCT = True ConfigFlags.Detector.GeometrySCT = True
......
...@@ -25,7 +25,7 @@ if __name__=="__main__": ...@@ -25,7 +25,7 @@ if __name__=="__main__":
ConfigFlags.Input.isMC = False ConfigFlags.Input.isMC = False
ConfigFlags.Input.ProjectName = "data16_13TeV" ConfigFlags.Input.ProjectName = "data16_13TeV"
ConfigFlags.Input.RunNumber = 310809 ConfigFlags.Input.RunNumber = 310809
ConfigFlags.addFlag("Input.InitialTimeStamp", 1476741326) # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC) ConfigFlags.Input.TimeStamp = 1476741326 # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC)
ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-10" ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-10"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
ConfigFlags.Detector.GeometrySCT = True ConfigFlags.Detector.GeometrySCT = True
......
...@@ -25,7 +25,7 @@ if __name__=="__main__": ...@@ -25,7 +25,7 @@ if __name__=="__main__":
ConfigFlags.Input.isMC = False ConfigFlags.Input.isMC = False
ConfigFlags.Input.ProjectName = "data16_13TeV" ConfigFlags.Input.ProjectName = "data16_13TeV"
ConfigFlags.Input.RunNumber = 310809 ConfigFlags.Input.RunNumber = 310809
ConfigFlags.addFlag("Input.InitialTimeStamp", 1476741326) # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC) ConfigFlags.Input.TimeStamp = 1476741326 # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC)
ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-06" ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-06"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
ConfigFlags.Detector.GeometrySCT = True ConfigFlags.Detector.GeometrySCT = True
......
...@@ -25,7 +25,7 @@ if __name__=="__main__": ...@@ -25,7 +25,7 @@ if __name__=="__main__":
ConfigFlags.Input.isMC = True ConfigFlags.Input.isMC = True
ConfigFlags.Input.ProjectName = "mc16_13TeV" ConfigFlags.Input.ProjectName = "mc16_13TeV"
ConfigFlags.Input.RunNumber = 300000 # MC16c 2017 run number ConfigFlags.Input.RunNumber = 300000 # MC16c 2017 run number
ConfigFlags.addFlag("Input.InitialTimeStamp", 1500000000) # MC16c 2017 time stamp ConfigFlags.Input.TimeStamp = 1500000000 # MC16c 2017 time stamp
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18" ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00" ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
ConfigFlags.Detector.GeometrySCT = True ConfigFlags.Detector.GeometrySCT = True
......
...@@ -25,7 +25,7 @@ if __name__=="__main__": ...@@ -25,7 +25,7 @@ if __name__=="__main__":
ConfigFlags.Input.isMC = True ConfigFlags.Input.isMC = True
ConfigFlags.Input.ProjectName = "mc16_13TeV" ConfigFlags.Input.ProjectName = "mc16_13TeV"
ConfigFlags.Input.RunNumber = 310000 # MC16e 2018 run number ConfigFlags.Input.RunNumber = 310000 # MC16e 2018 run number
ConfigFlags.addFlag("Input.InitialTimeStamp", 1550000000) # MC16e 2018 time stamp ConfigFlags.Input.TimeStamp = 1550000000 # MC16e 2018 time stamp
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-RUN2-01" ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-RUN2-01"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
ConfigFlags.Detector.GeometrySCT = True ConfigFlags.Detector.GeometrySCT = True
......
...@@ -26,7 +26,7 @@ if __name__=="__main__": ...@@ -26,7 +26,7 @@ if __name__=="__main__":
ConfigFlags.Input.isMC = True ConfigFlags.Input.isMC = True
ConfigFlags.Input.ProjectName = "mc16_13TeV" ConfigFlags.Input.ProjectName = "mc16_13TeV"
ConfigFlags.Input.RunNumber = 300000 # MC16c 2017 run number ConfigFlags.Input.RunNumber = 300000 # MC16c 2017 run number
ConfigFlags.addFlag("Input.InitialTimeStamp", 1500000000) ConfigFlags.Input.TimeStamp = 1500000000
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18" ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00" ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
ConfigFlags.Detector.GeometrySCT = True ConfigFlags.Detector.GeometrySCT = True
......
...@@ -25,7 +25,7 @@ if __name__=="__main__": ...@@ -25,7 +25,7 @@ if __name__=="__main__":
ConfigFlags.Input.isMC = True ConfigFlags.Input.isMC = True
ConfigFlags.Input.ProjectName = "mc16_13TeV" ConfigFlags.Input.ProjectName = "mc16_13TeV"
ConfigFlags.Input.RunNumber = 300000 # MC16c 2017 run number ConfigFlags.Input.RunNumber = 300000 # MC16c 2017 run number
ConfigFlags.addFlag("Input.InitialTimeStamp", 1500000000) # MC16c 2017 time stamp ConfigFlags.Input.TimeStamp = 1500000000 # MC16c 2017 time stamp
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18" ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00" ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
ConfigFlags.Detector.GeometrySCT = True ConfigFlags.Detector.GeometrySCT = True
......
...@@ -25,7 +25,7 @@ if __name__=="__main__": ...@@ -25,7 +25,7 @@ if __name__=="__main__":
ConfigFlags.Input.isMC = True ConfigFlags.Input.isMC = True
ConfigFlags.Input.ProjectName = "mc16_13TeV" ConfigFlags.Input.ProjectName = "mc16_13TeV"
ConfigFlags.Input.RunNumber = 300000 # MC16c 2017 run number ConfigFlags.Input.RunNumber = 300000 # MC16c 2017 run number
ConfigFlags.addFlag("Input.InitialTimeStamp", 1500000000) # MC16c 2017 time stamp ConfigFlags.Input.TimeStamp = 1500000000 # MC16c 2017 time stamp
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18" ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00" ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
ConfigFlags.Detector.GeometrySCT = True ConfigFlags.Detector.GeometrySCT = True
......
...@@ -64,7 +64,7 @@ if __name__=="__main__": ...@@ -64,7 +64,7 @@ if __name__=="__main__":
ConfigFlags.Input.isMC = True ConfigFlags.Input.isMC = True
ConfigFlags.Input.ProjectName = "mc16_13TeV" ConfigFlags.Input.ProjectName = "mc16_13TeV"
ConfigFlags.Input.RunNumber = 300000 # MC16c 2017 run number ConfigFlags.Input.RunNumber = 300000 # MC16c 2017 run number
ConfigFlags.addFlag("Input.InitialTimeStamp", 1500000000) ConfigFlags.Input.TimeStamp = 1500000000
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18" ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00" ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
ConfigFlags.Detector.GeometrySCT = True ConfigFlags.Detector.GeometrySCT = True
......
...@@ -25,7 +25,7 @@ if __name__=="__main__": ...@@ -25,7 +25,7 @@ if __name__=="__main__":
ConfigFlags.Input.isMC = False ConfigFlags.Input.isMC = False
ConfigFlags.Input.ProjectName = "data12_8TeV" ConfigFlags.Input.ProjectName = "data12_8TeV"
ConfigFlags.Input.RunNumber = 142913 ConfigFlags.Input.RunNumber = 142913
ConfigFlags.addFlag("Input.InitialTimeStamp", 1260630000) # During run 142913, 12/12/2009 @ 3:00pm (UTC) ConfigFlags.Input.TimeStamp = 1260630000 # During run 142913, 12/12/2009 @ 3:00pm (UTC)
ConfigFlags.IOVDb.GlobalTag = "COMCOND-BLKPA-RUN1-09" ConfigFlags.IOVDb.GlobalTag = "COMCOND-BLKPA-RUN1-09"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R1-2012-03-00-00" ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R1-2012-03-00-00"
ConfigFlags.Detector.GeometrySCT = True ConfigFlags.Detector.GeometrySCT = True
......
...@@ -25,7 +25,7 @@ if __name__=="__main__": ...@@ -25,7 +25,7 @@ if __name__=="__main__":
ConfigFlags.Input.isMC = True ConfigFlags.Input.isMC = True
ConfigFlags.Input.ProjectName = "mc16_13TeV" ConfigFlags.Input.ProjectName = "mc16_13TeV"
ConfigFlags.Input.RunNumber = 300000 # MC16c 2017 run number ConfigFlags.Input.RunNumber = 300000 # MC16c 2017 run number
ConfigFlags.addFlag("Input.InitialTimeStamp", 1500000000) # MC16c 2017 time stamp ConfigFlags.Input.TimeStamp = 1500000000 # MC16c 2017 time stamp
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18" ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00" ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
ConfigFlags.Detector.GeometrySCT = True ConfigFlags.Detector.GeometrySCT = True
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment