diff --git a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py
index d6cb86f138c5f7959f71f08541c1e4b058a7f76e..eb13356e675d322abbfa6a7455bef754da3a74db 100644
--- a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py
+++ b/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')
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py
index 00c993d79f4299e709bcf0ccdacfbed8d31395f2..3cb430033b127e461574c0be4b76e5cb318c943f 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py
+++ b/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')
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py
index 9d9cea9224b3f45313819c11d0f5ecb7bb1614ad..cdc0967451c1c3b6af55d32338f521bd1387fbf3 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py
+++ b/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')
diff --git a/Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py b/Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py
index e2837f5666c0cfbee6bdd9889534379279fef0ba..6b29c835bc85986fdce0ae5a8e3dbc52ebbc6e12 100755
--- a/Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py
+++ b/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
diff --git a/Calorimeter/CaloUtils/test/ToolWithConstants_test.py b/Calorimeter/CaloUtils/test/ToolWithConstants_test.py
index 01951871be1a8156a95a881e74933d229d5a207c..5901bb89ef23abafa332c6c25d5bd79210bbcf40 100755
--- a/Calorimeter/CaloUtils/test/ToolWithConstants_test.py
+++ b/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
diff --git a/Generators/McEventSelector/python/McEventSelectorConfig.py b/Generators/McEventSelector/python/McEventSelectorConfig.py
index d0c76bed1089b635f8cbca04acb8d02e1e177ee5..3a535931a4c062e3f9071dc2a9ecab6d9cb5966a 100644
--- a/Generators/McEventSelector/python/McEventSelectorConfig.py
+++ b/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)
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsParameterTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsParameterTestAlgConfig.py
index 2f0535c323d2c1ea8a35fe6494be95f2c152f32a..f420863321b5be9954007ef2454aeb2d91ef2bac 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsParameterTestAlgConfig.py
+++ b/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"
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsSummaryTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsSummaryTestAlgConfig.py
index 43759f21f9e81810d5d2da555fe249aaaea85594..9e9d73ca7189bd3334b03d4b15e0f9491fc9e331 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConditionsSummaryTestAlgConfig.py
+++ b/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
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConfigurationConditionsTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConfigurationConditionsTestAlgConfig.py
index c30082d708d4bb3af9e595b9440938367d3851fa..04ca6ffe66be78f8b3783dc30a63481644e7cb9a 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ConfigurationConditionsTestAlgConfig.py
+++ b/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
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_DCSConditionsTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_DCSConditionsTestAlgConfig.py
index 4692ba33c8e5c487b5594c8a86082bcc5f2cfdfd..2ca18736670d31bc9be01e4c3de4e28606b35086 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_DCSConditionsTestAlgConfig.py
+++ b/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
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_LinkMaskingTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_LinkMaskingTestAlgConfig.py
index 02fe8f9590e969d2852979547e3d2ea75a213589..d7f5d3913620b7d6a96fd8512529c972ff9a9847 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_LinkMaskingTestAlgConfig.py
+++ b/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
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MajorityConditionsTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MajorityConditionsTestAlgConfig.py
index 5dc62a8bb0ea0ba5eccbd9ecf7c4ecc8379b2a2a..35d2ce36f9b1203001f88f1c339bc57ca544099c 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MajorityConditionsTestAlgConfig.py
+++ b/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
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ModuleVetoTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ModuleVetoTestAlgConfig.py
index 65ca7cd97ffa929bd3ab49070558173b7965d3b2..5dd085aa1c3db8cc26b0aade3c19d2809bd229e4 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ModuleVetoTestAlgConfig.py
+++ b/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
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MonitorConditionsTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MonitorConditionsTestAlgConfig.py
index 34f58e30f9bf3df63934677c2afe61e3efdb3796..f8234d993e2a00e6a6feea617f955adb9e12f410 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MonitorConditionsTestAlgConfig.py
+++ b/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
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_RODVetoTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_RODVetoTestAlgConfig.py
index 7416073803c19eddbd0d027ceb01ad909601c564..14a69a6e1e6b58e5427c4c9b677924b59fe86a1f 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_RODVetoTestAlgConfig.py
+++ b/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
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibChipDataTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibChipDataTestAlgConfig.py
index bfbf482eee3849a13c9b947db0610dbd097d2c53..059a6a25c50128de9a4defaf27a6cb6087cc77c2 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibChipDataTestAlgConfig.py
+++ b/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
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibDataTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibDataTestAlgConfig.py
index 34499dcda73c4817a0df9795ceaba677d6f5c8d7..31e8f9501ce24f7b075a3ac97822be2b44d5b19c 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadCalibDataTestAlgConfig.py
+++ b/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
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadoutTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadoutTestAlgConfig.py
index ed4a7cc2f0f760b7c8c8be42d0ef3c97cbf173b3..278ffa7ce6a7b5e0f7546af7889f07a84fe79fe7 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ReadoutTestAlgConfig.py
+++ b/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
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SensorsTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SensorsTestAlgConfig.py
index 0dbce8e2670babc79dffc1b29bf91cca8e0451bc..be05222119d9190e8f611017f00e8bb325a478c1 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SensorsTestAlgConfig.py
+++ b/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
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SiliconConditionsTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SiliconConditionsTestAlgConfig.py
index f9cc5080ae16217c8f7ea757f34ea0868cff3665..ca2a3b13d96632004d506b76efda25b886969ab7 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_SiliconConditionsTestAlgConfig.py
+++ b/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
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_StripVetoTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_StripVetoTestAlgConfig.py
index 56ff2c2cc52b6f2d77739f5c580012727f9937fd..711d2ff4e715d05620e24d82c7d34ca1db43f629 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_StripVetoTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_StripVetoTestAlgConfig.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
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_TdaqEnabledTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_TdaqEnabledTestAlgConfig.py
index 138b92e5e6c466f44e11db36a7cde2d757ec7cd7..a3aa7f48a84e300ed2e603ac7ee14a50a48c9e8d 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_TdaqEnabledTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_TdaqEnabledTestAlgConfig.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
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTSiLorentzAngleTestAlgConfig.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTSiLorentzAngleTestAlgConfig.py
index 831eb0cb7d6a43920e9c017651e7e3784d61f11d..be75ca204d708f8575d77aba2583107dce350af5 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTSiLorentzAngleTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTSiLorentzAngleTestAlgConfig.py
@@ -27,7 +27,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
diff --git a/InnerDetector/InDetConditions/SiPropertiesTool/python/SCTSiPropertiesTestAlgConfig.py b/InnerDetector/InDetConditions/SiPropertiesTool/python/SCTSiPropertiesTestAlgConfig.py
index 14c994de6b0b03e605b2f0b22ad6c4065cc523eb..bc5344fb56cafdd4a2d6484e2c3b7b073a09ab1d 100644
--- a/InnerDetector/InDetConditions/SiPropertiesTool/python/SCTSiPropertiesTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SiPropertiesTool/python/SCTSiPropertiesTestAlgConfig.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
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/python/TestSCT_CablingConfig.py b/InnerDetector/InDetDetDescr/SCT_Cabling/python/TestSCT_CablingConfig.py
index e62fa9af769b0e9e6b9b15b650fd21e01f516a6e..244ae90b2cf6a4e3707e28c4692806588919f345 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/python/TestSCT_CablingConfig.py
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/python/TestSCT_CablingConfig.py
@@ -40,7 +40,7 @@ if __name__=="__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
ConfigFlags.Input.isMC = True
ConfigFlags.Input.RunNumber = [300000]
- ConfigFlags.addFlag("Input.InitialTimeStamp", 1500000000)
+ ConfigFlags.Input.TimeStamp = 1500000000
# https://twiki.cern.ch/twiki/bin/viewauth/AtlasComputing/ConditionsRun1RunNumbers
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-RUN12-SDR-25"
ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py
index 8bb5b2d30bf7a1522404612398df4b6dac5b03c8..838ef1791c837347530d01d58e0582da386ab235 100755
--- a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py
+++ b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py
@@ -111,7 +111,7 @@ except:
sys.argv = sys.argv[:1] + ['-b']
from AthenaConfiguration.AllConfigFlags import ConfigFlags
-ConfigFlags.addFlag("Input.InitialTimeStamp", 1000)
+ConfigFlags.Input.TimeStamp = 1000
ConfigFlags.Input.isMC=False
ConfigFlags.Input.RunNumber=run
ConfigFlags.IOVDb.DatabaseInstance="CONDBR2" if run>222222 else "COMP200"
diff --git a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py
index 2d8480e14d8572f40043efae986a643d74c6e1c8..5e6462c64090e18accada57931d6176c6b3b7a2f 100644
--- a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py
+++ b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py
@@ -176,7 +176,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')