Merge branch 'master-SiLorentzAngle-v2' into 'master'

Move required configuration for SCT to appropriate places

See merge request atlas/athena!37172

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_DCSConditionsTestAlgConfig.py

@@ -24,7 +24,7 @@ if __name__=="__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     ConfigFlags.Input.isMC = False
     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.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-06"
     ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
@@ -34,9 +34,6 @@ if __name__=="__main__":
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
     cfg = MainServicesCfg(ConfigFlags)
 
-    from AtlasGeoModel.GeoModelConfig import GeoModelCfg
-    cfg.merge(GeoModelCfg(ConfigFlags))
-
     from McEventSelector.McEventSelectorConfig import McEventSelectorCfg
     cfg.merge(McEventSelectorCfg(ConfigFlags))
 

InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_DCSConditionsConfig.py

@@ -4,6 +4,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 """
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
+from AtlasGeoModel.GeoModelConfig import GeoModelCfg
 from IOVDbSvc.IOVDbSvcConfig import addFolders
 SCT_DCSConditionsTool=CompFactory.SCT_DCSConditionsTool
 SCT_DCSConditionsStatCondAlg=CompFactory.SCT_DCSConditionsStatCondAlg
@@ -22,6 +23,7 @@ def SCT_DCSConditionsCfg(flags, name="InDetSCT_DCSConditions", **kwargs):
     DCSConditionsTool may be provided in kwargs
     """
     acc = ComponentAccumulator()
+    acc.merge(GeoModelCfg(flags)) # For SCT_ID used in SCT_DCSConditionsTool
     tool = kwargs.get("DCSConditionsTool", SCT_DCSConditionsToolCfg(flags))
     # folder arguments
     dbInstance = kwargs.get("dbInstance", "DCS_OFL")

InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTSiLorentzAngleTestAlgConfig.py

@@ -24,7 +24,7 @@ if __name__=="__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     ConfigFlags.Input.isMC = True
     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.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
     ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
@@ -34,9 +34,6 @@ if __name__=="__main__":
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
     cfg = MainServicesCfg(ConfigFlags)
 
-    from SCT_GeoModel.SCT_GeoModelConfig import SCT_GeometryCfg
-    cfg.merge(SCT_GeometryCfg(ConfigFlags))
-
     from McEventSelector.McEventSelectorConfig import McEventSelectorCfg
     cfg.merge(McEventSelectorCfg(ConfigFlags))
 

InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCT_LorentzAngleConfig.py

 """Define methods to configure SCTLorentzAngleTool
 
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 """
 from AthenaCommon import Logging
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -8,6 +8,7 @@ SiLorentzAngleTool=CompFactory.SiLorentzAngleTool
 SCTSiLorentzAngleCondAlg=CompFactory.SCTSiLorentzAngleCondAlg
 from SCT_ConditionsTools.SCT_DCSConditionsConfig import SCT_DCSConditionsCfg
 from SCT_ConditionsTools.SCT_SiliconConditionsConfig import SCT_SiliconConditionsCfg
+from SCT_GeoModel.SCT_GeoModelConfig import SCT_GeometryCfg
 from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg
 
 def SCT_LorentzAngleToolCfg(flags, name="SCT_LorentzAngleTool", **kwargs):
@@ -29,6 +30,7 @@ def SCT_LorentzAngleCfg(flags, name="SCT_SiLorentzAngleCondAlg",
         msg.error("Setting is wrong: both forceUseDB and forceUseGeoModel cannot be True at the same time")
     # construct with field services
     acc = MagneticFieldSvcCfg(flags)
+    acc.merge(SCT_GeometryCfg(flags)) # For SCT_DetectorElementCollection used in SCTSiLorentzAngleCondAlg
     tool = kwargs.get("SiLorentzAngleTool", SCT_LorentzAngleToolCfg(flags))
     if not forceUseGeoModel:
         DCSkwargs = {}