From c4b3bb28fa5866c0b4ca6c4bbbeecd4eccb262c0 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Fri, 4 Dec 2020 16:07:38 +0100
Subject: [PATCH] InDetRecTools: remove 'initialize/finalize successful' INFO
messages
Reduce verbosity during initialize/finalize. Also remove explicit
initialization of base class as this is done automatically.
---
.../DivisiveMultiSeedFinder.h | 6 +--
.../HistogrammingMultiSeedFinder.h | 6 +--
.../SlidingWindowMultiSeedFinder.h | 4 +-
.../src/DivisiveMultiSeedFinder.cxx | 9 +---
.../src/HistogrammingMultiSeedFinder.cxx | 9 +---
.../src/SlidingWindowMultiSeedFinder.cxx | 7 +--
.../InDetTrackClusterCleaningTool.h | 8 ++--
.../InDetTrackZ0SortingTool.h | 8 ++--
.../src/InDetTrackClusterCleaningTool.cxx | 9 +---
.../src/InDetTrackZ0SortingTool.cxx | 9 +---
.../InDetImprovedJetFitterVxFinder.h | 3 +-
.../InDetJetFitterUtils.h | 3 +-
.../InDetJetFitterVxFinder.h | 3 +-
.../JetFitterMultiStageFit.h | 4 +-
.../JetFitterTrackSelectorTool.h | 3 +-
.../src/InDetImprovedJetFitterVxFinder.cxx | 14 ------
.../src/InDetJetFitterUtils.cxx | 20 +-------
.../src/InDetJetFitterVxFinder.cxx | 47 +++----------------
.../src/JetFitterMultiStageFit.cxx | 40 ++--------------
.../src/JetFitterTrackSelectorTool.cxx | 9 ----
.../InDetCosmicTrackSelectorTool.h | 6 +--
.../InDetIsoTrackSelectorTool.h | 5 +-
.../InDetTrackSelectorTool.h | 6 +--
.../InDetTrtDriftCircleCutTool.h | 8 ++--
.../src/InDetCosmicTrackSelectorTool.cxx | 14 +-----
.../src/InDetIsoTrackSelectorTool.cxx | 8 +---
.../src/InDetTrackSelectorTool.cxx | 14 +-----
.../src/InDetTrtDriftCircleCutTool.cxx | 20 ++------
28 files changed, 51 insertions(+), 251 deletions(-)
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/DivisiveMultiSeedFinder.h b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/DivisiveMultiSeedFinder.h
index fa5d4b16313..7d11fb5e92a 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/DivisiveMultiSeedFinder.h
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/DivisiveMultiSeedFinder.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
*/
#ifndef InDetMultipleVertexSeedFinder_DivisiveMultiSeedFinder_H
@@ -29,9 +29,7 @@ namespace InDet
public:
- StatusCode initialize();
-
- StatusCode finalize();
+ virtual StatusCode initialize() override;
/**
* Constructor and destructor
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/HistogrammingMultiSeedFinder.h b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/HistogrammingMultiSeedFinder.h
index 0f4a651e8a1..2ccf1445c2f 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/HistogrammingMultiSeedFinder.h
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/HistogrammingMultiSeedFinder.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
*/
#ifndef InDetMultipleVertexSeedFinder_HistogrammingMultiSeedFinder_H
@@ -42,9 +42,7 @@ namespace InDet
{
public:
- StatusCode initialize();
-
- StatusCode finalize();
+ virtual StatusCode initialize() override;
/**
* Constructor and destructor
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/SlidingWindowMultiSeedFinder.h b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/SlidingWindowMultiSeedFinder.h
index ce611cefbad..fbbf71e2a23 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/SlidingWindowMultiSeedFinder.h
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/InDetMultipleVertexSeedFinder/SlidingWindowMultiSeedFinder.h
@@ -29,9 +29,7 @@ namespace InDet
{
public:
- StatusCode initialize();
-
- StatusCode finalize();
+ virtual StatusCode initialize() override;
/**
* Constructor and destructor
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/DivisiveMultiSeedFinder.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/DivisiveMultiSeedFinder.cxx
index eb229f8d590..dbec9d17a39 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/DivisiveMultiSeedFinder.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/DivisiveMultiSeedFinder.cxx
@@ -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
*/
#include "InDetMultipleVertexSeedFinder/DivisiveMultiSeedFinder.h"
@@ -60,12 +60,7 @@ namespace InDet
return StatusCode::SUCCESS;
}//end of initialize mtehod
-
- StatusCode DivisiveMultiSeedFinder::finalize()
- {
- msg(MSG::INFO) << "Finalize successful" << endmsg;
- return StatusCode::SUCCESS;
- }
+
DivisiveMultiSeedFinder::DivisiveMultiSeedFinder(const std::string& t, const std::string& n, const
IInterface*p):AthAlgTool(t,n,p),
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/HistogrammingMultiSeedFinder.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/HistogrammingMultiSeedFinder.cxx
index e94910a76cb..fc7c3bd7441 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/HistogrammingMultiSeedFinder.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/HistogrammingMultiSeedFinder.cxx
@@ -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
*/
#include "InDetMultipleVertexSeedFinder/HistogrammingMultiSeedFinder.h"
@@ -51,12 +51,7 @@ namespace InDet
return StatusCode::SUCCESS;
}//end of initialize mtehod
-
- StatusCode HistogrammingMultiSeedFinder::finalize()
- {
- msg(MSG::INFO) << "Finalize successful" << endmsg;
- return StatusCode::SUCCESS;
- }
+
HistogrammingMultiSeedFinder::HistogrammingMultiSeedFinder(const std::string& t, const std::string& n, const IInterface*p):
AthAlgTool(t,n,p),
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/SlidingWindowMultiSeedFinder.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/SlidingWindowMultiSeedFinder.cxx
index a2e31144835..20e5ecc6f90 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/SlidingWindowMultiSeedFinder.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/SlidingWindowMultiSeedFinder.cxx
@@ -55,12 +55,7 @@ namespace InDet
return StatusCode::SUCCESS;
}//end of initialize mtehod
- StatusCode SlidingWindowMultiSeedFinder::finalize()
- {
- msg(MSG::INFO) << "Finalize successful" << endmsg;
- return StatusCode::SUCCESS;
- }
-
+
SlidingWindowMultiSeedFinder::SlidingWindowMultiSeedFinder(const std::string& t, const std::string& n, const
IInterface*p):AthAlgTool(t,n,p),
m_clusterLength(5.),
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackClusterCleaningTool.h b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackClusterCleaningTool.h
index a2dea76b6db..2ea663f5559 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackClusterCleaningTool.h
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackClusterCleaningTool.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
*/
#ifndef InDetMultipleVertexSeedFinderUtils_InDetTrackClusterCleaningTool_H
@@ -40,11 +40,9 @@ namespace InDet
{
public:
- StatusCode initialize();
+ virtual StatusCode initialize() override;
- StatusCode finalize();
-
- InDetTrackClusterCleaningTool(const std::string& t, const std::string& n, const IInterface* p);
+ InDetTrackClusterCleaningTool(const std::string& t, const std::string& n, const IInterface* p);
static const InterfaceID& interfaceID() {return IID_InDetTrackClusterCleaningTool;}
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackZ0SortingTool.h b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackZ0SortingTool.h
index 7e95de1293c..beae551f65a 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackZ0SortingTool.h
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/InDetMultipleVertexSeedFinderUtils/InDetTrackZ0SortingTool.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
*/
#ifndef InDetMultipleVertexSeedFinderUtils_InDetTrackZ0SortingTool_H
@@ -41,11 +41,9 @@ namespace InDet
public:
- StatusCode initialize();
+ virtual StatusCode initialize() override;
- StatusCode finalize();
-
- InDetTrackZ0SortingTool(const std::string& t, const std::string& n, const IInterface* p);
+ InDetTrackZ0SortingTool(const std::string& t, const std::string& n, const IInterface* p);
static const InterfaceID& interfaceID() {return IID_InDetTrackZ0SortingTool;}
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackClusterCleaningTool.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackClusterCleaningTool.cxx
index e9ff208c483..45a8c646f6d 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackClusterCleaningTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackClusterCleaningTool.cxx
@@ -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
*/
#include "InDetMultipleVertexSeedFinderUtils/InDetTrackClusterCleaningTool.h"
@@ -26,12 +26,7 @@ namespace InDet
return StatusCode::SUCCESS;
}//end of initialize method
- StatusCode InDetTrackClusterCleaningTool::finalize()
- {
- msg(MSG::INFO) << "Finalize successful" << endmsg;
- return StatusCode::SUCCESS;
- }//end of finalize method
-
+
InDetTrackClusterCleaningTool::InDetTrackClusterCleaningTool(const std::string& t, const std::string& n, const IInterface* p):
AthAlgTool(t,n,p), m_extrapolator("Trk::Extrapolator") ,m_zOffset(3.)
{
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackZ0SortingTool.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackZ0SortingTool.cxx
index 286beb825ed..a6af97148ef 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackZ0SortingTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackZ0SortingTool.cxx
@@ -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
*/
#include "InDetMultipleVertexSeedFinderUtils/InDetTrackZ0SortingTool.h"
@@ -26,13 +26,6 @@ namespace InDet
}//end of initialize method
- StatusCode InDetTrackZ0SortingTool::finalize()
- {
- msg(MSG::INFO) << "Finalize successful" << endmsg;
- return StatusCode::SUCCESS;
- }//end of finalize method
-
-
InDetTrackZ0SortingTool::InDetTrackZ0SortingTool(const std::string& t, const std::string& n, const IInterface* p):
AthAlgTool(t,n,p), m_extrapolator("Trk::Extrapolator")
{
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h
index ecc984ff3cc..ed687a57f51 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h
@@ -65,8 +65,7 @@ namespace InDet {
public:
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
InDetImprovedJetFitterVxFinder(const std::string& t, const std::string& n, const IInterface* p);
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterUtils.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterUtils.h
index 5079e999341..451ccd0e3e6 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterUtils.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterUtils.h
@@ -62,8 +62,7 @@ namespace InDet {
}
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
InDetJetFitterUtils(const std::string& t, const std::string& n, const IInterface* p);
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h
index c35aea272bb..13cd285d356 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h
@@ -56,8 +56,7 @@ namespace InDet {
public:
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
InDetJetFitterVxFinder(const std::string& t, const std::string& n, const IInterface* p);
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterMultiStageFit.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterMultiStageFit.h
index f5308e779b8..abca6987242 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterMultiStageFit.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterMultiStageFit.h
@@ -36,9 +36,7 @@ public:
return IID_JetFitterMultiStageFit;
}
- StatusCode initialize();
-
- StatusCode finalize();
+ virtual StatusCode initialize() override;
JetFitterMultiStageFit(const std::string &t, const std::string &n, const IInterface *p);
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterTrackSelectorTool.h
index e8d4d1a1eaa..7ab33e6a68e 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterTrackSelectorTool.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterTrackSelectorTool.h
@@ -39,8 +39,7 @@ namespace InDet {
return IID_JetFitterTrackSelectorTool;
}
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
JetFitterTrackSelectorTool(const std::string &t, const std::string &n, const IInterface *p);
~JetFitterTrackSelectorTool();
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx
index 6c1a49d750a..94277862eb4 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx
@@ -96,12 +96,6 @@ namespace InDet
StatusCode InDetImprovedJetFitterVxFinder::initialize() {
- StatusCode sc = AlgTool::initialize();
- if(sc.isFailure()) {
- msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg;
- return sc;
- }
-
if (m_theTrackSelector.retrieve().isFailure()) {
msg(MSG::ERROR) << "Could not find TrackSelector tool." << endmsg;
return StatusCode::FAILURE;
@@ -122,18 +116,10 @@ namespace InDet
return StatusCode::FAILURE;
} else msg(MSG::INFO) << " JetFitterMultiStageFit retrieved" << endmsg;
- msg(MSG::INFO) << "Initialize successful" << endmsg;
return StatusCode::SUCCESS;
}
- StatusCode InDetImprovedJetFitterVxFinder::finalize() {
-
- msg(MSG::INFO) << "Finalize successful" << endmsg;
- return StatusCode::SUCCESS;
-
- }
-
Trk::VxSecVertexInfo* InDetImprovedJetFitterVxFinder::findSecVertex(const xAOD::Vertex & primaryVertex,
const TLorentzVector & jetMomentum,
const std::vector<const xAOD::IParticle*> & inputTracks) const
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx
index 8e0704beb5a..199f1d3c598 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx
@@ -82,17 +82,9 @@ namespace InDet
StatusCode InDetJetFitterUtils::initialize() {
-
- StatusCode sc = AlgTool::initialize();
- if(sc.isFailure())
- {
- msg(MSG::ERROR) <<" Unable to initialize the AlgTool"<<endmsg;
- return sc;
- }
-
if (!m_LinearizedTrackFactory.empty())
{
- sc=m_LinearizedTrackFactory.retrieve();
+ StatusCode sc=m_LinearizedTrackFactory.retrieve();
if (sc.isFailure()) {
msg(MSG::FATAL) << "Could not find TrackLinearizer tool." << endmsg;
return StatusCode::FAILURE;
@@ -106,7 +98,7 @@ namespace InDet
if (!m_extrapolator.empty())
{
- sc=m_extrapolator.retrieve();
+ StatusCode sc=m_extrapolator.retrieve();
if (sc.isFailure()) {
msg(MSG::FATAL) << "Could not find Extrapolator tool." << endmsg;
return StatusCode::FAILURE;
@@ -117,18 +109,10 @@ namespace InDet
}
}
- msg(MSG::INFO) << "Initialize successful" << endmsg;
return StatusCode::SUCCESS;
}
- StatusCode InDetJetFitterUtils::finalize() {
-
- msg(MSG::INFO) << "Finalize successful" << endmsg;
- return StatusCode::SUCCESS;
-
- }
-
std::pair<AmgMatrix(3,3),AmgSymMatrix(3)> InDetJetFitterUtils::getPosMomentumAndMomentumCovMatrix(const Trk::LinearizedTrack* linTrack,
const AmgSymMatrix(3) & vrt_cov,
const AmgSymMatrix(3) & vrt_weight) const
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterVxFinder.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterVxFinder.cxx
index d9c0440d058..c6b4d29acbd 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterVxFinder.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterVxFinder.cxx
@@ -71,52 +71,17 @@ namespace InDet
StatusCode InDetJetFitterVxFinder::initialize() {
-
-
- StatusCode sc = AthAlgTool::initialize();
- if(sc.isFailure())
- {
- msg(MSG::ERROR) << " Unable to initialize the AlgTool" << endmsg;
- return sc;
- }
-
+
//retrieving the udator itself
- sc = m_helper.retrieve();
- if(sc.isFailure()) {
- msg(MSG::ERROR) << " Unable to retrieve "<<m_helper<<endmsg;
- return StatusCode::FAILURE;
- }else msg(MSG::INFO) << "JetFitter Helper retrieved"<<endmsg;
-
-
- sc = m_initializationHelper.retrieve();
- if(sc.isFailure()) {
- msg(MSG::ERROR) << " Unable to retrieve "<<m_initializationHelper<<endmsg;
- return StatusCode::FAILURE;
- }else msg(MSG::INFO) << "JetFitter Initialization Helper retrieved"<<endmsg;
-
- sc = m_routines.retrieve();
- if(sc.isFailure()) {
- msg(MSG::ERROR) << " Unable to retrieve the JetFitter routines"<<m_routines<<endmsg;
- return StatusCode::FAILURE;
- }else msg(MSG::INFO) << "JetFitter Routines class retrieved"<<endmsg;
-
- if(m_trkFilter.retrieve().isFailure()) {
- msg(MSG::ERROR) << " Unable to retrieve "<<m_trkFilter<<endmsg;
- return StatusCode::FAILURE;
- } else msg(MSG::INFO) << "Track filter retrieved"<<endmsg;
-
- msg(MSG::INFO) << "Initialize successful" << endmsg;
+ ATH_CHECK( m_helper.retrieve() );
+ ATH_CHECK( m_initializationHelper.retrieve() );
+ ATH_CHECK( m_routines.retrieve() );
+ ATH_CHECK( m_trkFilter.retrieve() );
+
return StatusCode::SUCCESS;
}
- StatusCode InDetJetFitterVxFinder::finalize() {
-
- msg(MSG::INFO) << "Finalize successful" << endmsg;
- return StatusCode::SUCCESS;
-
- }
-
const Trk::VxSecVertexInfo* InDetJetFitterVxFinder::findSecVertex(const Trk::RecVertex & primaryVertex,
const TLorentzVector & jetMomentum,
const std::vector<const Trk::TrackParticleBase*> & myTracks) const {
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterMultiStageFit.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterMultiStageFit.cxx
index 5a100fc739f..975ca8b0ec7 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterMultiStageFit.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterMultiStageFit.cxx
@@ -30,46 +30,14 @@ JetFitterMultiStageFit::~JetFitterMultiStageFit() {}
StatusCode JetFitterMultiStageFit::initialize() {
- StatusCode sc = AlgTool::initialize();
- if (sc.isFailure()) {
- msg(MSG::ERROR) << " Unable to initialize the AlgTool" << endmsg;
- return sc;
- }
-
- sc = m_helper.retrieve();
- if(sc.isFailure()) {
- msg(MSG::ERROR) << " Unable to retrieve "<<m_helper<<endmsg;
- return StatusCode::FAILURE;
- }else msg(MSG::INFO) << "JetFitter Helper retrieved"<<endmsg;
-
- sc = m_initializationHelper.retrieve();
- if(sc.isFailure()) {
- msg(MSG::ERROR) << " Unable to retrieve "<<m_initializationHelper<<endmsg;
- return StatusCode::FAILURE;
- }else msg(MSG::INFO) << "JetFitter Initialization Helper retrieved"<<endmsg;
-
- sc = m_routines.retrieve();
- if(sc.isFailure())
- {
- msg(MSG::ERROR) << " Unable to retrieve the JetFitter routines"<<m_routines<<endmsg;
- return StatusCode::FAILURE;
- }
- else msg(MSG::INFO) << "JetFitter Routines class retrieved"<<endmsg;
-
- if (m_jetFitterUtils.retrieve().isFailure())
- {
- msg(MSG::ERROR) << "Could not find JetFitterUtils tool." << endmsg;
- return StatusCode::FAILURE;
- }
- else msg(MSG::INFO) << " JetFitterUtils retrieved" << endmsg;
+ ATH_CHECK( m_helper.retrieve() );
+ ATH_CHECK( m_initializationHelper.retrieve() );
+ ATH_CHECK( m_routines.retrieve() );
+ ATH_CHECK( m_jetFitterUtils.retrieve() );
return StatusCode::SUCCESS;
}
-StatusCode JetFitterMultiStageFit::finalize() {
- msg(MSG::INFO) << "Finalize successful" << endmsg;
- return StatusCode::SUCCESS;
-}
Trk::VxJetCandidate* JetFitterMultiStageFit::doTwoStageFit(const Trk::RecVertex & primaryVertex,
const TLorentzVector & jetMomentum,
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTrackSelectorTool.cxx
index 5625ed49e86..6c122a0daa1 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTrackSelectorTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTrackSelectorTool.cxx
@@ -16,11 +16,6 @@ using namespace InDet;
StatusCode JetFitterTrackSelectorTool::initialize() {
- if ( AlgTool::initialize().isFailure() ) {
- msg(MSG::ERROR) << " Unable to initialize the AlgTool" << endmsg;
- return StatusCode::FAILURE;
- }
-
if ( m_trkFilter.retrieve().isFailure() ) {
msg(MSG::ERROR) << " Unable to retrieve InDet::InDetDetailedTrackSelectorTool" << endmsg;
return StatusCode::FAILURE;
@@ -39,10 +34,6 @@ using namespace InDet;
return StatusCode::SUCCESS;
}
- StatusCode JetFitterTrackSelectorTool::finalize() {
- msg(MSG::INFO) << "Finalize successful" << endmsg;
- return StatusCode::SUCCESS;
- }
const Trk::SelectedTracksInJet* JetFitterTrackSelectorTool::doTrackSelection( const xAOD::Vertex &primaryVertex,
const TLorentzVector &jetMomentum,
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h
index cca93adf1f1..007d78cf743 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.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
*/
#ifndef InDetTrackSelectorTool_InDetCosmicTrackSelectorTool_H
@@ -32,9 +32,7 @@ namespace InDet
public:
- StatusCode initialize();
-
- StatusCode finalize();
+ virtual StatusCode initialize() override;
InDetCosmicTrackSelectorTool(const std::string& t, const std::string& n, const IInterface* p);
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h
index b282fadd429..b121018457f 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.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
*/
#ifndef InDetIsoTrackSelectorTool_InDetIsoTrackSelectorTool_H
@@ -35,8 +35,7 @@ namespace InDet
public:
/** Athena AlgTool methods */
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
/** Constructor / Destructor */
InDetIsoTrackSelectorTool(const std::string& t, const std::string& n, const IInterface* p);
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h
index 61e6889b7d2..386090734df 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.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
*/
#ifndef InDetTrackSelectorTool_InDetTrackSelectorTool_H
@@ -44,9 +44,7 @@ namespace InDet
public:
- StatusCode initialize();
-
- StatusCode finalize();
+ virtual StatusCode initialize() override;
InDetTrackSelectorTool(const std::string& t, const std::string& n, const IInterface* p);
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h
index a81a1e9e2e5..e399c8e5fc5 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.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
*/
#ifndef InDetTrackSelectorTool_InDetTrtDriftCircleCutTool_H
@@ -26,11 +26,9 @@ namespace InDet{
public:
- StatusCode initialize();
+ virtual StatusCode initialize() override;
- StatusCode finalize();
-
- InDetTrtDriftCircleCutTool(const std::string& t, const std::string& n, const IInterface* p);
+ InDetTrtDriftCircleCutTool(const std::string& t, const std::string& n, const IInterface* p);
~InDetTrtDriftCircleCutTool();
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetCosmicTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetCosmicTrackSelectorTool.cxx
index 4bc59141999..4be1d24aa4f 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetCosmicTrackSelectorTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetCosmicTrackSelectorTool.cxx
@@ -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
*/
#include "InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h"
@@ -45,11 +45,6 @@ namespace InDet
//----------------------------------------------------------------------------
StatusCode InDetCosmicTrackSelectorTool::initialize()
{
- if(AthAlgTool::initialize().isFailure()) {
- msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg;
- return StatusCode::FAILURE;
- }
-
m_trackSumToolAvailable = false;
if (!m_trackSumTool.empty()) {
if(m_trackSumTool.retrieve().isFailure())
@@ -67,13 +62,6 @@ namespace InDet
return StatusCode::SUCCESS;
}
- //----------------------------------------------------------------------------
- StatusCode InDetCosmicTrackSelectorTool::finalize()
- {
- ATH_MSG_INFO("Finalize successful");
- return StatusCode::SUCCESS;
- }
-
//----------------------------------------------------------------------------
bool InDetCosmicTrackSelectorTool::decision(const Trk::Track & track, const Trk::Vertex * vertex) const
{
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetIsoTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetIsoTrackSelectorTool.cxx
index 41ca00683ac..a89d0425286 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetIsoTrackSelectorTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetIsoTrackSelectorTool.cxx
@@ -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
*/
#include "InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h"
@@ -62,12 +62,6 @@ StatusCode InDet::InDetIsoTrackSelectorTool::initialize()
return StatusCode::SUCCESS;
}
-//_______________________________________________________________________________
-StatusCode InDet::InDetIsoTrackSelectorTool::finalize()
-{
- ATH_MSG_INFO("Finalize successful");
- return StatusCode::SUCCESS;
-}
//_______________________________________________________________________________
bool InDet::InDetIsoTrackSelectorTool::decision(const Trk::AtaStraightLine& atl, const Trk::Track& track) const
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx
index 6e45d318c95..9d54d1e48ea 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx
@@ -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
*/
#include "InDetTrackSelectorTool/InDetTrackSelectorTool.h"
@@ -51,12 +51,6 @@ InDetTrackSelectorTool::~InDetTrackSelectorTool()
//_______________________________________________________________________________
StatusCode InDetTrackSelectorTool::initialize()
{
- StatusCode sc = AthAlgTool::initialize();
- if(sc.isFailure()) {
- msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg;
- return StatusCode::FAILURE;
- }
-
m_trackSumToolAvailable = false;
if (!m_trackSumTool.empty())
{
@@ -79,12 +73,6 @@ StatusCode InDetTrackSelectorTool::initialize()
return StatusCode::SUCCESS;
}
-//_______________________________________________________________________________
-StatusCode InDetTrackSelectorTool::finalize()
-{
- ATH_MSG_INFO("Finalize successful");
- return StatusCode::SUCCESS;
-}
//_______________________________________________________________________________
bool InDetTrackSelectorTool::decision(const Trk::Track & track, const Trk::Vertex * vertex) const
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx
index d46a2587db7..0df692d48f8 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx
@@ -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
*/
#include "InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h"
@@ -7,26 +7,12 @@
StatusCode InDet::InDetTrtDriftCircleCutTool::initialize()
{
- StatusCode sc = AthAlgTool::initialize();
-
-
- if(sc.isFailure()){
- msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg;
- return StatusCode::FAILURE;
- }
-
- // Read key
- ATH_CHECK( m_strawReadKey.initialize() );
+ // Read key
+ ATH_CHECK( m_strawReadKey.initialize() );
return StatusCode::SUCCESS;
}
-StatusCode InDet::InDetTrtDriftCircleCutTool::finalize()
-{
- msg(MSG::INFO) << "Finalize successful" << endmsg;
- return StatusCode::SUCCESS;
-}
-
InDet::InDetTrtDriftCircleCutTool::InDetTrtDriftCircleCutTool(const std::string& t, const std::string& n, const IInterface* p)
:AthAlgTool(t,n,p),
m_minOffset(0),
--
GitLab