From 1e93f16ea38cec004e8e6db9566bbf1c366f383f Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Fri, 6 Aug 2021 14:27:56 +0000
Subject: [PATCH] Replace usage of ConfigFlags.Input.InitialTimeStamp with
 ConfigFlags.Input.TimeStamp

---
 .../CaloRec/python/CaloCellContainerAliasAlg_test.py        | 2 +-
 .../CaloRec/python/CaloThinCellsByClusterAlg_test.py        | 2 +-
 .../CaloRec/python/CaloThinCellsBySamplingAlg_test.py       | 2 +-
 Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py       | 2 +-
 Calorimeter/CaloUtils/test/ToolWithConstants_test.py        | 2 +-
 Generators/McEventSelector/python/McEventSelectorConfig.py  | 6 ++++--
 .../python/SCT_ConditionsParameterTestAlgConfig.py          | 2 +-
 .../python/SCT_ConditionsSummaryTestAlgConfig.py            | 2 +-
 .../python/SCT_ConfigurationConditionsTestAlgConfig.py      | 2 +-
 .../python/SCT_DCSConditionsTestAlgConfig.py                | 2 +-
 .../python/SCT_LinkMaskingTestAlgConfig.py                  | 2 +-
 .../python/SCT_MajorityConditionsTestAlgConfig.py           | 2 +-
 .../python/SCT_ModuleVetoTestAlgConfig.py                   | 2 +-
 .../python/SCT_MonitorConditionsTestAlgConfig.py            | 2 +-
 .../python/SCT_RODVetoTestAlgConfig.py                      | 2 +-
 .../python/SCT_ReadCalibChipDataTestAlgConfig.py            | 2 +-
 .../python/SCT_ReadCalibDataTestAlgConfig.py                | 2 +-
 .../python/SCT_ReadoutTestAlgConfig.py                      | 2 +-
 .../python/SCT_SensorsTestAlgConfig.py                      | 2 +-
 .../python/SCT_SiliconConditionsTestAlgConfig.py            | 2 +-
 .../python/SCT_StripVetoTestAlgConfig.py                    | 2 +-
 .../python/SCT_TdaqEnabledTestAlgConfig.py                  | 2 +-
 .../python/SCTSiLorentzAngleTestAlgConfig.py                | 2 +-
 .../SiPropertiesTool/python/SCTSiPropertiesTestAlgConfig.py | 2 +-
 .../SCT_Cabling/python/TestSCT_CablingConfig.py             | 2 +-
 .../LArConditionsCommon/share/LArCellConditions.py          | 2 +-
 .../FastCaloSim/python/AddNoiseCellBuilderTool_test.py      | 2 +-
 27 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py
index d6cb86f138c..eb13356e675 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 00c993d79f4..3cb430033b1 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 9d9cea9224b..cdc0967451c 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 e2837f5666c..6b29c835bc8 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 01951871be1..5901bb89ef2 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 d0c76bed108..3a535931a4c 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 2f0535c323d..f420863321b 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 43759f21f9e..9e9d73ca718 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 c30082d708d..04ca6ffe66b 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 4692ba33c8e..2ca18736670 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 02fe8f9590e..d7f5d391362 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 5dc62a8bb0e..35d2ce36f9b 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 65ca7cd97ff..5dd085aa1c3 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 34f58e30f9b..f8234d993e2 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 7416073803c..14a69a6e1e6 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 bfbf482eee3..059a6a25c50 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 34499dcda73..31e8f9501ce 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 ed4a7cc2f0f..278ffa7ce6a 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 0dbce8e2670..be05222119d 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 f9cc5080ae1..ca2a3b13d96 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 56ff2c2cc52..711d2ff4e71 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 138b92e5e6c..a3aa7f48a84 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 831eb0cb7d6..be75ca204d7 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 14c994de6b0..bc5344fb56c 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 e62fa9af769..244ae90b2cf 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 8bb5b2d30bf..838ef1791c8 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 2d8480e14d8..5e6462c6409 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')
-- 
GitLab