From 96b30f0006ec063cf8889ba167fc400540f43edd Mon Sep 17 00:00:00 2001
From: Susumu Oda <susumu.oda@cern.ch>
Date: Fri, 19 Apr 2019 00:09:54 +0000
Subject: [PATCH] Change properties of
SCT_RawDataByteStreamCnv/share/testSCTDecode.py (ATLASRECTS-4939)
---
.../share/testSCTDecode.py | 5 +++--
.../SiClusterizationTool/src/ClusterMakerTool.cxx | 14 ++++++++++----
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
index 3d68614d76b..f3a934fd598 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
@@ -109,8 +109,9 @@ from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
from SiClusterizationTool.SiClusterizationToolConf import InDet__ClusterMakerTool
InDetClusterMakerTool = InDet__ClusterMakerTool(name = "InDetClusterMakerTool",
- PixelCalibSvc = None,
- UsePixelCalibCondDB = False,
+ PixelCablingSvc = None,
+ PixelModuleData = "",
+ PixelChargeCalibCondData = "",
PixelLorentzAngleTool = None,
SCTLorentzAngleTool = sctLorentzAngleToolSetup.SCTLorentzAngleTool)
# SCT conditions setups
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx
index 48ca2ce627e..4fa271ee69e 100755
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx
@@ -61,10 +61,16 @@ StatusCode ClusterMakerTool::initialize(){
// Code entered here will be executed once at program start.
ATH_MSG_INFO ( name() << " initialize()" );
-
- ATH_CHECK(m_pixelCabling.retrieve());
- ATH_CHECK(m_moduleDataKey.initialize());
- ATH_CHECK(m_chargeDataKey.initialize());
+
+ if (not m_pixelCabling.empty()) {
+ ATH_CHECK(m_pixelCabling.retrieve());
+ }
+ if (not m_moduleDataKey.empty()) {
+ ATH_CHECK(m_moduleDataKey.initialize());
+ }
+ if (not m_chargeDataKey.empty()) {
+ ATH_CHECK(m_chargeDataKey.initialize());
+ }
if (not m_pixelLorentzAngleTool.empty()) {
ATH_CHECK(m_pixelLorentzAngleTool.retrieve());
--
GitLab