From c15ca7edbaeb8489ad484b2efc1eca55df367ac0 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 7 Dec 2017 11:24:47 +0100
Subject: [PATCH] Explicitly specify return value in CHECK macro
Explicitly specify the CHECK macro return value (0 or false) for methods returning
an int/bool instead of relying on the implicit StatusCode conversion.
---
Commission/CommissionUtils/src/CosmicTriggerTimeTool.cxx | 2 +-
ForwardDetectors/ALFA/ALFA_CLinkAlg/src/ALFA_CLinkAlg.cxx | 2 +-
.../SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.cxx | 2 +-
LArCalorimeter/LArBadChannelTool/src/LArBadChanTool.cxx | 2 +-
Reconstruction/MET/METReconstruction/Root/METTauTool.cxx | 2 +-
.../RecoTools/IsolationTool/Root/IsolationHelper.cxx | 6 +++---
.../TBConditions/TBCaloConditions/src/TBCaloCoolPosTool.cxx | 2 +-
.../TBConditions/TBCaloConditions/src/TBCaloPosTool.cxx | 2 +-
.../TrigTauEmulation/Root/Level1EmulationTool.cxx | 2 +-
.../EnhancedBiasWeighter/Root/EnhancedBiasWeighter.cxx | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Commission/CommissionUtils/src/CosmicTriggerTimeTool.cxx b/Commission/CommissionUtils/src/CosmicTriggerTimeTool.cxx
index b4063c39e21..a80e49d11f0 100644
--- a/Commission/CommissionUtils/src/CosmicTriggerTimeTool.cxx
+++ b/Commission/CommissionUtils/src/CosmicTriggerTimeTool.cxx
@@ -142,7 +142,7 @@ double CosmicTriggerTimeTool::larTime()
for (;it!=it_e;++it) {
const LArHitContainer* cont;
- CHECK( evtStore()->retrieve(cont,(*it)) );
+ CHECK( evtStore()->retrieve(cont,(*it)), 0 );
LArHitContainer::const_iterator hit_it = cont->begin();
LArHitContainer::const_iterator hit_it_e = cont->end();
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/ALFA_CLinkAlg.cxx b/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/ALFA_CLinkAlg.cxx
index 26ceb9318d7..fa6ba0ebd84 100644
--- a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/ALFA_CLinkAlg.cxx
+++ b/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/ALFA_CLinkAlg.cxx
@@ -290,7 +290,7 @@ unsigned long long ALFA_CLinkAlg::CalcDCSId(eDCSItem eItem)
}
const CondAttrListCollection* pAttrListCol=NULL;
- CHECK(detStore()->retrieve(pAttrListCol,Folder));
+ CHECK(detStore()->retrieve(pAttrListCol,Folder), 0);
if(!m_iovSvc->getKeyInfo(Folder,Foldername,Tag,Range,bRetrieved,ullBytesRead,fReadTime)) {
msg(MSG::ERROR)<<"Couldn't get IOV data about folder: "<<Folder<<endmsg;
return 0;
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.cxx
index ade5381e903..80385180e8e 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.cxx
@@ -904,7 +904,7 @@ int SCT_RodDecoder::makeRDO(int strip, int groupSize, int tbin, uint32_t onlineI
SCT_RDO_Collection* col = nullptr;
- ATH_CHECK(rdoIdc.naughtyRetrieve(idCollHash, col));//Returns null if not present
+ ATH_CHECK(rdoIdc.naughtyRetrieve(idCollHash, col), 0);//Returns null if not present
if(!col){
ATH_MSG_DEBUG(" Collection ID = " << idCollHash << " does not exist, create it ");
diff --git a/LArCalorimeter/LArBadChannelTool/src/LArBadChanTool.cxx b/LArCalorimeter/LArBadChannelTool/src/LArBadChanTool.cxx
index e5b782fcbde..b1c8549903d 100644
--- a/LArCalorimeter/LArBadChannelTool/src/LArBadChanTool.cxx
+++ b/LArCalorimeter/LArBadChannelTool/src/LArBadChanTool.cxx
@@ -414,7 +414,7 @@ bool LArBadChanTool::readFromDB( const DataHandle<CondAttrListCollection> collec
bool LArBadChanTool::readBadFebsFromDB()
{
- ATH_CHECK( detStore()->retrieve( m_DBBadFebColl, m_DBBadFebFolder) );
+ ATH_CHECK( detStore()->retrieve( m_DBBadFebColl, m_DBBadFebFolder), false );
ATH_MSG_INFO ( "Retrieved folder " << m_DBBadFebFolder );
if (!m_DBBadFebColl.isValid()){
diff --git a/Reconstruction/MET/METReconstruction/Root/METTauTool.cxx b/Reconstruction/MET/METReconstruction/Root/METTauTool.cxx
index 0d8a2f05298..52c222abbc8 100644
--- a/Reconstruction/MET/METReconstruction/Root/METTauTool.cxx
+++ b/Reconstruction/MET/METReconstruction/Root/METTauTool.cxx
@@ -187,7 +187,7 @@ namespace met {
/////////////////////////////////////////// TO-BE REMOVED!!!
const CaloClusterContainer* modClusCont(0);
if(m_useModClus) {
- ATH_CHECK( evtStore()->retrieve(modClusCont,m_mod_clus_key) );
+ ATH_CHECK( evtStore()->retrieve(modClusCont,m_mod_clus_key), false );
}
double sumE_allclus = 0.;
std::vector<const IParticle*> constit_vec;
diff --git a/Reconstruction/RecoTools/IsolationTool/Root/IsolationHelper.cxx b/Reconstruction/RecoTools/IsolationTool/Root/IsolationHelper.cxx
index 9fafb986dfb..30cff463f2e 100644
--- a/Reconstruction/RecoTools/IsolationTool/Root/IsolationHelper.cxx
+++ b/Reconstruction/RecoTools/IsolationTool/Root/IsolationHelper.cxx
@@ -120,7 +120,7 @@ namespace CP {
bool IsolationHelper::updateIsolation(xAOD::MuonContainer*& copy,xAOD::ShallowAuxContainer*& copyaux, std::vector<xAOD::Iso::IsolationType>& types, xAOD::Iso::IsolationCaloCorrectionBitset corrMask, std::string muonkey, bool recordSG) const {
const xAOD::MuonContainer* muons(0);
- ATH_CHECK( evtStore()->retrieve(muons,muonkey) );
+ ATH_CHECK( evtStore()->retrieve(muons,muonkey), false );
std::pair<xAOD::MuonContainer*,xAOD::ShallowAuxContainer*> shallowcopy = xAOD::shallowCopyContainer(*muons);
copy = shallowcopy.first;
copyaux = shallowcopy.second;
@@ -142,8 +142,8 @@ namespace CP {
}
if(recordSG) {
- ATH_CHECK( evtStore()->record(shallowcopy.first, "IsoFixed_"+muonkey) );
- ATH_CHECK( evtStore()->record(shallowcopy.second,"IsoFixed_"+muonkey+"Aux.") );
+ ATH_CHECK( evtStore()->record(shallowcopy.first, "IsoFixed_"+muonkey), false );
+ ATH_CHECK( evtStore()->record(shallowcopy.second,"IsoFixed_"+muonkey+"Aux."), false );
}
return true;
}
diff --git a/TestBeam/TBConditions/TBCaloConditions/src/TBCaloCoolPosTool.cxx b/TestBeam/TBConditions/TBCaloConditions/src/TBCaloCoolPosTool.cxx
index 18825bd3b7b..ee5290492f8 100755
--- a/TestBeam/TBConditions/TBCaloConditions/src/TBCaloCoolPosTool.cxx
+++ b/TestBeam/TBConditions/TBCaloConditions/src/TBCaloCoolPosTool.cxx
@@ -81,7 +81,7 @@ bool TBCaloCoolPosTool::initHandles()
ATH_MSG_DEBUG ("in initHandles()" );
const EventInfo* evtInfo = nullptr;
- ATH_CHECK( evtStore()->retrieve(evtInfo) );
+ ATH_CHECK( evtStore()->retrieve(evtInfo), false );
int run = evtInfo->event_ID()->run_number();
diff --git a/TestBeam/TBConditions/TBCaloConditions/src/TBCaloPosTool.cxx b/TestBeam/TBConditions/TBCaloConditions/src/TBCaloPosTool.cxx
index 7582f4f7ec6..c351d5eaaed 100755
--- a/TestBeam/TBConditions/TBCaloConditions/src/TBCaloPosTool.cxx
+++ b/TestBeam/TBConditions/TBCaloConditions/src/TBCaloPosTool.cxx
@@ -82,7 +82,7 @@ bool TBCaloPosTool::initHandles()
ATH_MSG_DEBUG ("in initHandles()" );
const EventInfo* evtInfo = nullptr;
- ATH_CHECK( evtStore()->retrieve(evtInfo) );
+ ATH_CHECK( evtStore()->retrieve(evtInfo), false );
int run = evtInfo->event_ID()->run_number();
diff --git a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/Level1EmulationTool.cxx b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/Level1EmulationTool.cxx
index 56ae7a0cb7c..c97cecbe13f 100644
--- a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/Level1EmulationTool.cxx
+++ b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/Level1EmulationTool.cxx
@@ -398,7 +398,7 @@ namespace TrigTauEmul {
}
MY_MSG_DEBUG("executing " << chain_name);
- ATH_CHECK(m_name_parser->execute(chain_name));
+ ATH_CHECK(m_name_parser->execute(chain_name), false);
for (auto it: m_name_parser->get_items()) {
MY_MSG_DEBUG(it.first << " " << m_counters[it.first] << " " << it.second);
if (m_counters[it.first] < it.second) {
diff --git a/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeighter.cxx b/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeighter.cxx
index c5ebec3bfa8..051b55aec6f 100644
--- a/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeighter.cxx
+++ b/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeighter.cxx
@@ -393,7 +393,7 @@ double EnhancedBiasWeighter::getEBWeight(const xAOD::EventInfo* eventInfo) const
return 0;
}
- ATH_CHECK( trackAverages(eventInfo) );
+ ATH_CHECK( trackAverages(eventInfo), 0 );
if (m_calculateWeightingData) {
--
GitLab