Merge branch 'add-mssing-conditions-dependencies-for-sct' into 'master'

Additional dependencies to force conditions loading in InDet_CacheCreator

See merge request atlas/athena!7429

Former-commit-id: f02ddde0

InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.cxx

@@ -23,9 +23,9 @@ namespace InDet{
     m_PIXclusterContainerCacheKey(""),
     m_PIXSpacePointCacheKey(""),
     m_SCTSpacePointCacheKey(""),
+
     m_SCTRDOCacheKey(""), m_PixRDOCacheKey(""),
-    m_disableTRT(false), m_condKey("SCT_MonitorConditionsCondData"),
-    m_condKey2("SCT_TdaqEnabledCondData")
+    m_disableTRT(false)
     {
         declareProperty("TRT_DriftCircleKey", m_rioContainerCacheKey);
         declareProperty("SCT_ClusterKey"    , m_SCTclusterContainerCacheKey);
@@ -34,8 +34,6 @@ namespace InDet{
         declareProperty("SpacePointCacheSCT"  , m_SCTSpacePointCacheKey);
         declareProperty("SCTRDOCacheKey", m_SCTRDOCacheKey);
         declareProperty("disableTRT"  , m_disableTRT);
-        declareProperty("Condkey", m_condKey);
-        declareProperty("Condkey2", m_condKey2);
         declareProperty("PixRDOCacheKey", m_PixRDOCacheKey);
     }
 
@@ -50,6 +48,8 @@ namespace InDet{
         ATH_CHECK( m_PixRDOCacheKey.initialize(!m_PixRDOCacheKey.key().empty()) );
         ATH_CHECK( m_condKey.initialize() );
         ATH_CHECK( m_condKey2.initialize() );
+	ATH_CHECK( m_condKey3.initialize() );
+	ATH_CHECK( m_condKey4.initialize() );
         if(!m_disableTRT) ATH_CHECK(detStore()->retrieve(m_pTRTHelper  , "TRT_ID"));
         ATH_CHECK(detStore()->retrieve(m_sct_idHelper, "SCT_ID"));
         ATH_CHECK(detStore()->retrieve(m_pix_idHelper, "PixelID"));

InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.h

@@ -18,6 +18,8 @@ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 #include "TrkSpacePoint/SpacePointContainer.h"
 #include "SCT_ConditionsData/SCT_MonitorConditionsCondData.h"
 #include "SCT_ConditionsData/SCT_TdaqEnabledCondData.h"
+#include "SCT_ConditionsData/SCT_ConfigurationCondData.h"
+#include "SCT_ConditionsData/SCT_AllGoodStripInfo.h"
 #include "InDetRawData/SCT_RDO_Container.h"
 #include "InDetRawData/PixelRDO_Container.h"
 
@@ -48,8 +50,11 @@ namespace InDet{
         SG::WriteHandleKey<SCT_RDO_Cache>      m_SCTRDOCacheKey;
         SG::WriteHandleKey<PixelRDO_Cache>     m_PixRDOCacheKey;
         bool m_disableTRT;
-        SG::ReadCondHandleKey<SCT_MonitorConditionsCondData> m_condKey;//Temporary workarounds for problem in scheduler - remove later
-        SG::ReadCondHandleKey<SCT_TdaqEnabledCondData> m_condKey2;
+	//Temporary workarounds for problem in scheduler - remove later
+        SG::ReadCondHandleKey<SCT_MonitorConditionsCondData> m_condKey{ this, "SCT_MonitorConditionsCondData", "SCT_MonitorConditionsCondData", "" };
+        SG::ReadCondHandleKey<SCT_TdaqEnabledCondData> m_condKey2{ this, "SCT_TdaqEnabledCondData", "SCT_TdaqEnabledCondData", "" };
+        SG::ReadCondHandleKey<SCT_ConfigurationCondData> m_condKey3{ this, "SCT_ConfigurationCondData", "SCT_ConfigurationCondData", "" };
+        SG::ReadCondHandleKey<SCT_AllGoodStripInfo> m_condKey4{ this, "SCT_AllGoodStripInfo", "SCT_AllGoodStripInfo", "" };
 
         template<typename T>
         StatusCode CreateContainer(const SG::WriteHandleKey<T>& , long unsigned int , const EventContext& ) const;