From 6dd7d1310b95e54377501fa9db65f6e4e9e876f3 Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej.novak@cern.ch>
Date: Thu, 8 Oct 2020 22:09:03 +0200
Subject: [PATCH] Fix SiRegSelCondAlg initialisation
---
DetectorDescription/RegionSelector/python/RegSelToolConfig.py | 2 ++
.../InDetDetDescr/InDetRegionSelector/src/SiRegSelCondAlg.cxx | 4 ++--
.../InDetDetDescr/InDetRegionSelector/src/SiRegSelCondAlg.h | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/DetectorDescription/RegionSelector/python/RegSelToolConfig.py b/DetectorDescription/RegionSelector/python/RegSelToolConfig.py
index 8ed2f0a3b34..738b154e955 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 cf624941498..f719917d7ba 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 85082b55bc9..9dfdde02749 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"};
--
GitLab