From 2125e9a5a10caa27ed733b0f1eef89fb2bbec793 Mon Sep 17 00:00:00 2001
From: Siarhei Harkusha <Siarhei.Harkusha@cern.ch>
Date: Thu, 18 Oct 2018 17:12:11 +0200
Subject: [PATCH] Fix dependency of CaloBadChanTool (ATLASRECTS-4635)
TileBadChanTool tools was not declared as property
of CaloBadChanTool and it's dependencies was not propagated
up to CaloBadChanTool. This caused problems in AthenaMT
because this dependency was not propated to the algorithms
which use CaloBadChanTool. Now TileBadChanTool is declared
as property of CaloBadChanTool and made private.
The same is done also for LArBadChanTool because anyway
it should be made private at some moment.
Former-commit-id: 069ece005218e44bd11ed1a661f1a0ca2ccedb36
---
.../CaloBadChannelTool/CaloBadChannelTool/CaloBadChanTool.h | 4 ++--
Calorimeter/CaloBadChannelTool/src/CaloBadChanTool.cxx | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Calorimeter/CaloBadChannelTool/CaloBadChannelTool/CaloBadChanTool.h b/Calorimeter/CaloBadChannelTool/CaloBadChannelTool/CaloBadChanTool.h
index e6e6c9aa44a..8654daa6540 100644
--- a/Calorimeter/CaloBadChannelTool/CaloBadChannelTool/CaloBadChanTool.h
+++ b/Calorimeter/CaloBadChannelTool/CaloBadChannelTool/CaloBadChanTool.h
@@ -28,8 +28,8 @@ public:
private:
- ToolHandle<ICaloBadChanTool> m_larBCT;
- ToolHandle<ICaloBadChanTool> m_tileBCT;
+ ToolHandle<ICaloBadChanTool> m_larBCT{this, "LArBadChanTool", "LArBadChanTool", "LAr bad channel tool"};
+ ToolHandle<ICaloBadChanTool> m_tileBCT{this, "TileBadChanTool", "TileBadChanTool", "Tile bad channel tool"};
const CaloCell_ID* m_caloID;
};
diff --git a/Calorimeter/CaloBadChannelTool/src/CaloBadChanTool.cxx b/Calorimeter/CaloBadChannelTool/src/CaloBadChanTool.cxx
index 0786f77c5cf..52ce2b512c9 100644
--- a/Calorimeter/CaloBadChannelTool/src/CaloBadChanTool.cxx
+++ b/Calorimeter/CaloBadChannelTool/src/CaloBadChanTool.cxx
@@ -10,8 +10,6 @@
CaloBadChanTool::CaloBadChanTool(const std::string& type, const std::string& name,
const IInterface* parent) :
AthAlgTool( type, name, parent),
- m_larBCT("LArBadChanTool"),
- m_tileBCT("TileBadChanTool"),
m_caloID(nullptr)
{
declareInterface<ICaloBadChanTool>(this);
--
GitLab