Merge branch 'conddep.SCT_ConditionsTools-20200719' into 'master'

SCT_ConditionsTools: Clean up conditions dependencies.

See merge request atlas/athena!34899

InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_SiliconConditionsTool.cxx

 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_SiliconConditionsTool.h"
@@ -33,13 +33,15 @@ StatusCode SCT_SiliconConditionsTool::initialize() {
       ATH_MSG_INFO("GeoModel requests to use Conditions DB.");
     }
   } 
+
+  ATH_CHECK(m_condKeyHV.initialize ((not m_useGeoModel) && m_useDB));
+  ATH_CHECK(m_condKeyTemp.initialize ((not m_useGeoModel) && m_useDB));
+
   if (not m_useGeoModel) {
     ATH_MSG_INFO("Will use temperature and voltages from this service (not from GeoModel).");
    
     // Get from Conditions database. Register callback, etc.
     if (m_useDB) {
-      ATH_CHECK(m_condKeyHV.initialize());
-      ATH_CHECK(m_condKeyTemp.initialize());
       ATH_CHECK(detStore()->retrieve(m_sct_id, "SCT_ID"));
 
       ATH_MSG_INFO("SCTDCSSvc retrieved");