diff --git a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_SiliconHVCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_SiliconHVCondAlg.cxx index 6ac351d670769eeb7725742a8a5ffd40877814af..48b58ef878e0224a70a0c604a6671b844b75c61a 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_SiliconHVCondAlg.cxx +++ b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_SiliconHVCondAlg.cxx @@ -21,6 +21,7 @@ SCT_SiliconHVCondAlg::SCT_SiliconHVCondAlg(const std::string& name, ISvcLocator* declareProperty("ReadKeyState", m_readKeyState, "Key of input state conditions folder"); declareProperty("ReadKeyHV", m_readKeyHV, "Key of input HV conditions folder"); declareProperty("WriteKey", m_writeKey, "Key of output bias voltage conditions folder"); + declareProperty("DCSConditionsSvc", m_sctDCSSvc, "SCT_DCSConditionsSvc"); } SCT_SiliconHVCondAlg::~SCT_SiliconHVCondAlg() { diff --git a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_SiliconTempCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_SiliconTempCondAlg.cxx index 240072f91e236fed9b0edf5da17adffe4b5c9f96..bf000baf89c311e2629c123f03fcf426d49dda72 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_SiliconTempCondAlg.cxx +++ b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_SiliconTempCondAlg.cxx @@ -21,6 +21,7 @@ SCT_SiliconTempCondAlg::SCT_SiliconTempCondAlg(const std::string& name, ISvcLoca declareProperty("ReadKeyState", m_readKeyState, "Key of input state conditions folder"); declareProperty("ReadKeyTemp", m_readKeyTemp0, "Key of input (hybrid) temperature conditions folder"); declareProperty("WriteKey", m_writeKey, "Key of output (sensor) temperature conditions folder"); + declareProperty("DCSConditionsSvc", m_sctDCSSvc, "SCT_DCSConditionsSvc"); } SCT_SiliconTempCondAlg::~SCT_SiliconTempCondAlg() { diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SCTLorentzAngleSvcSetup.py b/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SCTLorentzAngleSvcSetup.py index 95f4e21275987c7037e52ccc037a14397b996edb..ef2f91a2f2f8e71304d74303d263521db4a079fa 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SCTLorentzAngleSvcSetup.py +++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SCTLorentzAngleSvcSetup.py @@ -83,6 +83,10 @@ class SCTLorentzAngleSvcSetup: if not hasattr(condSeq, "SCT_SiliconTempCondAlg"): from SCT_ConditionsServices.SCT_ConditionsServicesConf import SCT_SiliconTempCondAlg condSeq += SCT_SiliconTempCondAlg(name = "SCT_SiliconTempCondAlg") + if not hasattr(svcMgr, "InDetSCT_DCSConditionsSvc"): + from SCT_ConditionsServices.SCT_ConditionsServicesConf import SCT_DCSConditionsSvc + InDetSCT_DCSConditionsSvc = SCT_DCSConditionsSvc(name = "InDetSCT_DCSConditionsSvc") + svcMgr += InDetSCT_DCSConditionsSvc # Pass the silicon conditions services to the Lorentz angle service # Also make sure UseMagFieldTool is True as AtlasGeoModel sets this to False diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py index 5332171c5ca450099248ec1319826c71093b6221..534fbd8078d045b116e39cdff76734c526b4dd0e 100644 --- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py +++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py @@ -499,10 +499,12 @@ class SCT_ConditionsServicesSetup: condSeq = AthSequencer("AthCondSeq") if not hasattr(condSeq, "SCT_SiliconTempCondAlg"): from SCT_ConditionsServices.SCT_ConditionsServicesConf import SCT_SiliconTempCondAlg - condSeq += SCT_SiliconTempCondAlg(name = "SCT_SiliconTempCondAlg") + condSeq += SCT_SiliconTempCondAlg(name = "SCT_SiliconTempCondAlg", + DCSConditionsSvc=self.dcsSvc) if not hasattr(condSeq, "SCT_SiliconHVCondAlg"): from SCT_ConditionsServices.SCT_ConditionsServicesConf import SCT_SiliconHVCondAlg - condSeq += SCT_SiliconHVCondAlg(name = "SCT_SiliconHVCondAlg") + condSeq += SCT_SiliconHVCondAlg(name = "SCT_SiliconHVCondAlg", + DCSConditionsSvc=self.dcsSvc) from SCT_ConditionsServices.SCT_ConditionsServicesConf import SCT_SiliconConditionsSvc sctSiliconConditionsSvc= SCT_SiliconConditionsSvc(name=self.instanceName('InDetSCT_SiliconConditionsSvc'), DCSConditionsSvc=self.dcsSvc)