diff --git a/LArCalorimeter/LArCalibTools/LArCalibTools/LArCond2NtupleBase.h b/LArCalorimeter/LArCalibTools/LArCalibTools/LArCond2NtupleBase.h index 11a125292f33062cf31458a79289e382c8d4ac6f..9eb8d2c3ecbd6da5de02b4a70cd6441a11aa73e6 100644 --- a/LArCalorimeter/LArCalibTools/LArCalibTools/LArCond2NtupleBase.h +++ b/LArCalorimeter/LArCalibTools/LArCalibTools/LArCond2NtupleBase.h @@ -42,6 +42,8 @@ class LArCond2NtupleBase : public AthAlgorithm { //StatusCode initializeBase(const std::string& path, const std::string& name); bool fillFromIdentifier(const HWIdentifier& id); //returns true if connected + const SG::ReadCondHandleKey<LArOnOffIdMapping>& cablingKey() const; + private: bool m_initialized; diff --git a/LArCalorimeter/LArCalibTools/LArCalibTools/LArOFCBinAlg.h b/LArCalorimeter/LArCalibTools/LArCalibTools/LArOFCBinAlg.h index 720fee57e763805905c9029ac6e70ed8a2b0ec95..310e695e8c3836cad987a33bc0facb49a5bb874d 100644 --- a/LArCalorimeter/LArCalibTools/LArCalibTools/LArOFCBinAlg.h +++ b/LArCalorimeter/LArCalibTools/LArCalibTools/LArOFCBinAlg.h @@ -25,7 +25,6 @@ class LArOFCBinAlg: public LArCond2NtupleBase { private: - SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey{this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"}; std::string m_inputContainer; std::string m_outputContainer; std::string m_fileName; diff --git a/LArCalorimeter/LArCalibTools/src/LArCond2NtupleBase.cxx b/LArCalorimeter/LArCalibTools/src/LArCond2NtupleBase.cxx index 4e557d57421106f035cc064850d0f33a04aa47dd..1966aecfb2afcfd5aadbe9fbc00a1d8d149281b4 100644 --- a/LArCalorimeter/LArCalibTools/src/LArCond2NtupleBase.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArCond2NtupleBase.cxx @@ -373,3 +373,10 @@ bool LArCond2NtupleBase::fillFromIdentifier(const HWIdentifier& hwid) { return connected; } + + +const SG::ReadCondHandleKey<LArOnOffIdMapping>& +LArCond2NtupleBase::cablingKey() const +{ + return m_cablingKey; +} diff --git a/LArCalorimeter/LArCalibTools/src/LArOFCBinAlg.cxx b/LArCalorimeter/LArCalibTools/src/LArOFCBinAlg.cxx index 5c70fd7fe62abf8fd4783acc653c41cd97f6ccfc..15c7236617762165e9f9167071979418b3ee0926 100644 --- a/LArCalorimeter/LArCalibTools/src/LArOFCBinAlg.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArOFCBinAlg.cxx @@ -31,7 +31,6 @@ StatusCode LArOFCBinAlg::initialize() { //} m_ntTitle="Bin"; m_ntpath=std::string("/NTUPLES/FILE1/OFCBINDIFF"); - ATH_CHECK( m_cablingKey.initialize() ); return LArCond2NtupleBase::initialize(); } @@ -98,10 +97,10 @@ StatusCode LArOFCBinAlg::execute() { msg(MSG::ERROR) << "Failed to register container with key " << m_outputContainer << " to StoreGate" << endmsg; } - SG::ReadCondHandle<LArOnOffIdMapping> cablingHdl{m_cablingKey}; + SG::ReadCondHandle<LArOnOffIdMapping> cablingHdl{cablingKey()}; const LArOnOffIdMapping* cabling{*cablingHdl}; if(!cabling) { - ATH_MSG_ERROR( "Do not have cabling mapping from key " << m_cablingKey.key() ); + ATH_MSG_ERROR( "Do not have cabling mapping from key " << cablingKey().key() ); return StatusCode::FAILURE; } const CaloCell_ID* idHelper = nullptr;