From 7cc4774b752c0b8a2f275074c2b481173bc56863 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Fri, 8 Dec 2017 14:59:42 +0100
Subject: [PATCH] Remove implicit StatusCode bool/long conversions
Use the proper return type instead of relying on StatusCode/bool
conversions.
Former-commit-id: 292c3c6bceeb21696aeaeb3b44236359191528ad
---
TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx | 2 +-
TestBeam/TBRec/src/CBNTAA_TBInfo.cxx | 4 ++--
TestBeam/TBRec/src/TBAlgoSequencer.cxx | 2 +-
TestBeam/TBRec/src/TBTrackToCaloAlg.cxx | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx b/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx
index 70d7cd1f76c..9c4077c246a 100755
--- a/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx
+++ b/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx
@@ -399,7 +399,7 @@ TBCaloCoordinate:: read_MC_position()
// get the manager used for simulation :
- ATH_CHECK( detStore()->retrieve( m_MCmgr ) );
+ ATH_CHECK( detStore()->retrieve( m_MCmgr ), false );
}
ATH_MSG_DEBUG ( " found TBDetDescrManager " );
diff --git a/TestBeam/TBRec/src/CBNTAA_TBInfo.cxx b/TestBeam/TBRec/src/CBNTAA_TBInfo.cxx
index de25ff15a8b..918e78476c1 100755
--- a/TestBeam/TBRec/src/CBNTAA_TBInfo.cxx
+++ b/TestBeam/TBRec/src/CBNTAA_TBInfo.cxx
@@ -143,7 +143,7 @@ StatusCode CBNTAA_TBInfo::CBNT_execute(){
if ( sc1.isFailure() )
{
ATH_MSG_ERROR( "Unable to get the StoreGateSvc" );
- return false ;
+ return StatusCode::FAILURE ;
}
const EventInfo* evtInfo;
@@ -151,7 +151,7 @@ StatusCode CBNTAA_TBInfo::CBNT_execute(){
if ( sc1.isFailure() )
{
ATH_MSG_INFO( "Unable to get EventInfo, run probably not begun yet " );
- return false ;
+ return StatusCode::FAILURE ;
}
int run = evtInfo->event_ID()->run_number();
diff --git a/TestBeam/TBRec/src/TBAlgoSequencer.cxx b/TestBeam/TBRec/src/TBAlgoSequencer.cxx
index 32a5d0aceff..e446f1ea79a 100755
--- a/TestBeam/TBRec/src/TBAlgoSequencer.cxx
+++ b/TestBeam/TBRec/src/TBAlgoSequencer.cxx
@@ -164,7 +164,7 @@ TBAlgoSequencer::execute()
algoCounter++;
}
// this is the trick - catch it before the framework terminates the job!
- return SUCCESS;
+ return StatusCode::SUCCESS;
}
//////////////
diff --git a/TestBeam/TBRec/src/TBTrackToCaloAlg.cxx b/TestBeam/TBRec/src/TBTrackToCaloAlg.cxx
index 3855bded2f5..b0f1dbafcb5 100755
--- a/TestBeam/TBRec/src/TBTrackToCaloAlg.cxx
+++ b/TestBeam/TBRec/src/TBTrackToCaloAlg.cxx
@@ -167,7 +167,7 @@ bool TBTrackToCaloAlg::CreateTrkImpactInCalo()
{
if (m_TrackParticleName == "") {
ATH_MSG_ERROR ("m_TrackParticleName not set" );
- return StatusCode::SUCCESS;
+ return true;
}
sc = evtStore()->retrieve(m_particle, m_TrackParticleName);
@@ -189,7 +189,7 @@ bool TBTrackToCaloAlg::CreateTrkImpactInCalo()
{
if (m_TrackName == "") {
ATH_MSG_ERROR ("m_TrackName not set" );
- return StatusCode::SUCCESS;
+ return true;
}
sc = evtStore()->retrieve(m_tracks, m_TrackName);
@@ -668,7 +668,7 @@ bool TBTrackToCaloAlg::PrintCellsCrossed()
// get tracks from TDS
if (m_TrackName == "") {
ATH_MSG_ERROR ("m_TrackName not set" );
- return StatusCode::SUCCESS;
+ return true;
}
StatusCode sc = evtStore()->retrieve(m_tracks, m_TrackName);
--
GitLab