From 2e5432d87d96b8f8ced12bed0b0fa91225390edf Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Sun, 6 Dec 2020 23:50:23 -0500
Subject: [PATCH] ISF_FatrasTools: Fix gcc11 warnings.
Misleading indentation.
---
.../ISF_FatrasTools/src/PhysicsValidationTool.h | 16 +++++++++-------
.../ISF_FatrasTools/src/ProcessSamplingTool.h | 16 +++++++++-------
.../ISF_FatrasTools/src/TransportTool.h | 16 +++++++++-------
3 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhysicsValidationTool.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhysicsValidationTool.h
index faea26e8522..7f5b6c4b5d1 100755
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhysicsValidationTool.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhysicsValidationTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -78,12 +78,14 @@ namespace iFatras
private:
/** templated Tool retrieval - gives unique handling & look and feel */
template <class T> StatusCode retrieveTool(ToolHandle<T>& thandle){
- if (!thandle.empty() && thandle.retrieve().isFailure()){
- ATH_MSG_FATAL( "[ fatras setup ] Cannot retrieve " << thandle << ". Abort.");
- return StatusCode::FAILURE;
- } else
- ATH_MSG_DEBUG("[ fatras setup ] Successfully retrieved " << thandle);
- return StatusCode::SUCCESS;
+ if (!thandle.empty() && thandle.retrieve().isFailure()){
+ ATH_MSG_FATAL( "[ fatras setup ] Cannot retrieve " << thandle << ". Abort.");
+ return StatusCode::FAILURE;
+ }
+ else {
+ ATH_MSG_DEBUG("[ fatras setup ] Successfully retrieved " << thandle);
+ }
+ return StatusCode::SUCCESS;
}
void saveInfo(const ISF::ISFParticle& isp) const;
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/ProcessSamplingTool.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/ProcessSamplingTool.h
index 081bc73c3c7..1e5c949887a 100755
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/ProcessSamplingTool.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/ProcessSamplingTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -70,12 +70,14 @@ namespace iFatras
private:
/** templated Tool retrieval - gives unique handling & look and feel */
template <class T> StatusCode retrieveTool(ToolHandle<T>& thandle){
- if (!thandle.empty() && thandle.retrieve().isFailure()){
- ATH_MSG_FATAL( "[ fatras setup ] Cannot retrieve " << thandle << ". Abort.");
- return StatusCode::FAILURE;
- } else
- ATH_MSG_DEBUG("[ fatras setup ] Successfully retrieved " << thandle);
- return StatusCode::SUCCESS;
+ if (!thandle.empty() && thandle.retrieve().isFailure()){
+ ATH_MSG_FATAL( "[ fatras setup ] Cannot retrieve " << thandle << ". Abort.");
+ return StatusCode::FAILURE;
+ }
+ else {
+ ATH_MSG_DEBUG("[ fatras setup ] Successfully retrieved " << thandle);
+ }
+ return StatusCode::SUCCESS;
}
/*---------------------------------------------------------------------
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/TransportTool.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/TransportTool.h
index bd11bdde883..cfb58209fa8 100755
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/TransportTool.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/TransportTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -75,12 +75,14 @@ namespace iFatras
private:
/** templated Tool retrieval - gives unique handling & look and feel */
template <class T> StatusCode retrieveTool(ToolHandle<T>& thandle){
- if (!thandle.empty() && thandle.retrieve().isFailure()){
- ATH_MSG_FATAL( "[ fatras setup ] Cannot retrieve " << thandle << ". Abort.");
- return StatusCode::FAILURE;
- } else
- ATH_MSG_DEBUG("[ fatras setup ] Successfully retrieved " << thandle);
- return StatusCode::SUCCESS;
+ if (!thandle.empty() && thandle.retrieve().isFailure()){
+ ATH_MSG_FATAL( "[ fatras setup ] Cannot retrieve " << thandle << ". Abort.");
+ return StatusCode::FAILURE;
+ }
+ else {
+ ATH_MSG_DEBUG("[ fatras setup ] Successfully retrieved " << thandle);
+ }
+ return StatusCode::SUCCESS;
}
/*---------------------------------------------------------------------
--
GitLab