diff --git a/DetectorDescription/RegionSelector/python/RegSelToolConfig.py b/DetectorDescription/RegionSelector/python/RegSelToolConfig.py index 8ed2f0a3b34d4f9c8acb85aa96c528dbac3dbf3f..738b154e955711e3c795788acc9bdecda235798d 100644 --- a/DetectorDescription/RegionSelector/python/RegSelToolConfig.py +++ b/DetectorDescription/RegionSelector/python/RegSelToolConfig.py @@ -26,8 +26,10 @@ def _createRegSelCondAlg( detector, CondAlgConstructor ): if detector == "Pixel": condAlg.DetEleCollKey = "PixelDetectorElementCollection" + condAlg.PixelCablingCondData = "PixelCablingCondData" elif detector == "SCT": condAlg.DetEleCollKey = "SCT_DetectorElementCollection" + condAlg.SCT_CablingData = "SCT_CablingData" return condAlg def _createRegSelTool( detector, enable ): diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegSelCondAlg.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegSelCondAlg.cxx index cf62494149841bc157e071dd5d1f58defeeaceae..f719917d7baa0d1781cdcdeb84eb1ee288fafe10 100644 --- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegSelCondAlg.cxx +++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegSelCondAlg.cxx @@ -44,8 +44,8 @@ SiRegSelCondAlg::SiRegSelCondAlg(const std::string& name, ISvcLocator* pSvcLocat StatusCode SiRegSelCondAlg::initialize() { ATH_MSG_DEBUG("SiRegSelCondAlg::initialize() "); - ATH_CHECK(m_pixCablingKey.initialize()); - ATH_CHECK(m_sctCablingKey.initialize()); + ATH_CHECK(m_pixCablingKey.initialize(!m_pixCablingKey.empty())); + ATH_CHECK(m_sctCablingKey.initialize(!m_sctCablingKey.empty())); ATH_CHECK(m_detEleCollKey.initialize()); ATH_CHECK(m_tableKey.initialize()); ATH_MSG_INFO("SiRegSelCondAlg::initialize() " << m_tableKey ); diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegSelCondAlg.h b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegSelCondAlg.h index 85082b55bc9c8bd31de63c216f043a5517fcb829..9dfdde02749b2b620d2135c9da0e8e9c351bcc0d 100755 --- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegSelCondAlg.h +++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegSelCondAlg.h @@ -47,10 +47,10 @@ public: /// even if only one is to be used SG::ReadCondHandleKey<SCT_CablingData> m_sctCablingKey - {this, "SCT_CablingData", "SCT_CablingData", "SCT cabling key"}; + {this, "SCT_CablingData", "", "SCT cabling key"}; SG::ReadCondHandleKey<PixelCablingCondData> m_pixCablingKey - {this, "PixelCablingCondData", "PixelCablingCondData", "Pixel cabling key"}; + {this, "PixelCablingCondData", "", "Pixel cabling key"}; SG::ReadCondHandleKey<InDetDD::SiDetectorElementCollection> m_detEleCollKey {this, "DetEleCollKey", "PixelDetectorElementCollection", "Key of SiDetectorElementCollection for Pixel/SCT"};