Merge branch 'EvgenCAServices_Fix_master' into 'master'

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

See merge request atlas/athena!45658

Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py

@@ -59,7 +59,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 
 ConfigFlags.Input.Files = defaultTestFiles.RDO
-ConfigFlags.addFlag("Input.InitialTimeStamp", 1000)
+ConfigFlags.Input.TimeStamp = 1000
 ConfigFlags.Detector.GeometryLAr = True
 ConfigFlags.Detector.GeometryTile = True
 ConfigFlags.needFlagsCategory('Tile')

Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py

@@ -145,7 +145,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 
 ConfigFlags.Input.Files = defaultTestFiles.RDO
-ConfigFlags.addFlag("Input.InitialTimeStamp", 1000)
+ConfigFlags.Input.TimeStamp = 1000
 ConfigFlags.Detector.GeometryLAr = True
 ConfigFlags.Detector.GeometryTile = True
 ConfigFlags.needFlagsCategory('Tile')

Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py

@@ -80,7 +80,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 
 ConfigFlags.Input.Files = defaultTestFiles.RDO
-ConfigFlags.addFlag("Input.InitialTimeStamp", 1000)
+ConfigFlags.Input.TimeStamp = 1000
 ConfigFlags.Detector.GeometryLAr = True
 ConfigFlags.Detector.GeometryTile = True
 ConfigFlags.needFlagsCategory('Tile')

Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py

@@ -50,7 +50,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 
 ConfigFlags.Input.Files = defaultTestFiles.RDO
-ConfigFlags.addFlag("Input.InitialTimeStamp", 1000)
+ConfigFlags.Input.TimeStamp = 1000
 
 ConfigFlags.lock()
 from AthenaConfiguration.MainServicesConfig import MainServicesCfg 

Calorimeter/CaloUtils/test/ToolWithConstants_test.py

@@ -93,7 +93,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 
 ConfigFlags.Input.Files = defaultTestFiles.RDO
-ConfigFlags.addFlag("Input.InitialTimeStamp", 1000)
+ConfigFlags.Input.TimeStamp = 1000
 
 ConfigFlags.lock()
 from AthenaConfiguration.MainServicesConfig import MainServicesCfg 

Generators/McEventSelector/python/McEventSelectorConfig.py

@@ -20,8 +20,10 @@ def McEventSelectorCfg(configFlags, **kw):
     if isinstance(rn, type([])):
         rn = rn[0]
     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():
         setattr (evSel, k, v)
     cfg.addService(evSel)

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsParameterTestAlgConfig.py

@@ -25,7 +25,7 @@ if __name__=="__main__":
     ConfigFlags.Input.isMC = False
     ConfigFlags.Input.ProjectName = "data12_8TeV"
     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.DatabaseInstance = "COMP200"
     ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R1-2012-03-00-00"

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsSummaryTestAlgConfig.py

@@ -26,7 +26,7 @@ if __name__=="__main__":
     ConfigFlags.Input.isMC = False
     ConfigFlags.Input.ProjectName = "data17_13TeV"
     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.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
     ConfigFlags.Detector.GeometrySCT = True

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConfigurationConditionsTestAlgConfig.py

@@ -25,7 +25,7 @@ if __name__=="__main__":
     ConfigFlags.Input.isMC = True
     ConfigFlags.Input.ProjectName = "mc16_13TeV"
     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.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
     ConfigFlags.Detector.GeometrySCT = True

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_DCSConditionsTestAlgConfig.py

@@ -25,7 +25,7 @@ if __name__=="__main__":
     ConfigFlags.Input.isMC = False
     ConfigFlags.Input.ProjectName = "data16_13TeV"
     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.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
     ConfigFlags.Detector.GeometrySCT = True

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_LinkMaskingTestAlgConfig.py

@@ -25,7 +25,7 @@ if __name__=="__main__":
     ConfigFlags.Input.isMC = False
     ConfigFlags.Input.ProjectName = "data16_13TeV"
     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.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
     ConfigFlags.Detector.GeometrySCT = True

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MajorityConditionsTestAlgConfig.py

@@ -25,7 +25,7 @@ if __name__=="__main__":
     ConfigFlags.Input.isMC = False
     ConfigFlags.Input.ProjectName = "data16_13TeV"
     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.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
     ConfigFlags.Detector.GeometrySCT = True

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ModuleVetoTestAlgConfig.py

@@ -25,7 +25,7 @@ if __name__=="__main__":
     ConfigFlags.Input.isMC = True
     ConfigFlags.Input.ProjectName = "mc16_13TeV"
     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.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
     ConfigFlags.Detector.GeometrySCT = True

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MonitorConditionsTestAlgConfig.py

@@ -25,7 +25,7 @@ if __name__=="__main__":
     ConfigFlags.Input.isMC = True
     ConfigFlags.Input.ProjectName = "mc16_13TeV"
     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.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
     ConfigFlags.Detector.GeometrySCT = True

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_RODVetoTestAlgConfig.py

@@ -26,7 +26,7 @@ if __name__=="__main__":
     ConfigFlags.Input.isMC = True
     ConfigFlags.Input.ProjectName = "mc16_13TeV"
     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.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
     ConfigFlags.Detector.GeometrySCT = True

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibChipDataTestAlgConfig.py

@@ -25,7 +25,7 @@ if __name__=="__main__":
     ConfigFlags.Input.isMC = True
     ConfigFlags.Input.ProjectName = "mc16_13TeV"
     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.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
     ConfigFlags.Detector.GeometrySCT = True

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibDataTestAlgConfig.py

@@ -25,7 +25,7 @@ if __name__=="__main__":
     ConfigFlags.Input.isMC = True
     ConfigFlags.Input.ProjectName = "mc16_13TeV"
     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.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
     ConfigFlags.Detector.GeometrySCT = True

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadoutTestAlgConfig.py

@@ -64,7 +64,7 @@ if __name__=="__main__":
     ConfigFlags.Input.isMC = True
     ConfigFlags.Input.ProjectName = "mc16_13TeV"
     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.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
     ConfigFlags.Detector.GeometrySCT = True

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SensorsTestAlgConfig.py

@@ -25,7 +25,7 @@ if __name__=="__main__":
     ConfigFlags.Input.isMC = False
     ConfigFlags.Input.ProjectName = "data12_8TeV"
     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.GeoModel.AtlasVersion = "ATLAS-R1-2012-03-00-00"
     ConfigFlags.Detector.GeometrySCT = True

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SiliconConditionsTestAlgConfig.py

@@ -25,7 +25,7 @@ if __name__=="__main__":
     ConfigFlags.Input.isMC = True
     ConfigFlags.Input.ProjectName = "mc16_13TeV"
     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.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
     ConfigFlags.Detector.GeometrySCT = True