From 74e8e12f11d4f203dd50107e50744f9fc72d3b16 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Fri, 4 Dec 2020 17:03:21 +0100
Subject: [PATCH] TrkExtrapolation: Reduce verbosity of intersectors during
initialize/finalize
---
.../src/RungeKuttaIntersector.cxx | 4 ++--
.../src/SolenoidalIntersector.cxx | 4 +---
.../StraightLineIntersector.h | 4 +---
.../src/StraightLineIntersector.cxx | 20 ++-----------------
4 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/RungeKuttaIntersector.cxx b/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/RungeKuttaIntersector.cxx
index 3d03b69aaf4f..022ab47d4f78 100755
--- a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/RungeKuttaIntersector.cxx
+++ b/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/RungeKuttaIntersector.cxx
@@ -81,7 +81,7 @@ RungeKuttaIntersector::RungeKuttaIntersector (const std::string& type,
StatusCode
RungeKuttaIntersector::initialize(){
// print name and package version
- ATH_MSG_DEBUG( "RungeKuttaIntersector::initialize()" << " - package version " << PACKAGE_VERSION );
+ ATH_MSG_DEBUG( "RungeKuttaIntersector::initialize()" );
// initialize base class
if (StatusCode::SUCCESS != AlgTool::initialize()) return StatusCode::FAILURE;
@@ -107,9 +107,9 @@ RungeKuttaIntersector::initialize(){
StatusCode
RungeKuttaIntersector::finalize()
{
- msg(MSG::INFO) << "finalized after " << m_countExtrapolations << " extrapolations,";
if (m_countExtrapolations)
{
+ msg(MSG::INFO) << "finalized after " << m_countExtrapolations << " extrapolations,";
double norm = 1./static_cast<double>(m_countExtrapolations);
msg(MSG::INFO) << std::setiosflags(std::ios::fixed)
<< " taking an average" << std::setw(7) << std::setprecision(1)
diff --git a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/SolenoidalIntersector.cxx b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/SolenoidalIntersector.cxx
index a16fc7b52090..ed142d802a30 100755
--- a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/SolenoidalIntersector.cxx
+++ b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/SolenoidalIntersector.cxx
@@ -53,8 +53,6 @@ SolenoidalIntersector::SolenoidalIntersector (const std::string& type,
StatusCode
SolenoidalIntersector::initialize()
{
- // print name and package version
- ATH_MSG_INFO( "SolenoidalIntersector::initialize() - package version " << PACKAGE_VERSION );
ATH_CHECK( m_solenoidParametrizationKey.initialize() );
ATH_CHECK(m_rungeKuttaIntersector.retrieve());
return StatusCode::SUCCESS;
@@ -63,7 +61,7 @@ SolenoidalIntersector::initialize()
StatusCode
SolenoidalIntersector::finalize()
{
- ATH_MSG_INFO( "finalized after " << m_countExtrapolations << " extrapolations with "
+ ATH_MSG_DEBUG( "finalized after " << m_countExtrapolations << " extrapolations with "
<< m_countRKSwitches << " switches to RK integration");
return StatusCode::SUCCESS;
diff --git a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/TrkExStraightLineIntersector/StraightLineIntersector.h b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/TrkExStraightLineIntersector/StraightLineIntersector.h
index 37ca2bfa21be..4e589d59d2a5 100755
--- a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/TrkExStraightLineIntersector/StraightLineIntersector.h
+++ b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/TrkExStraightLineIntersector/StraightLineIntersector.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2017, 2019, 2020 CERN for the benefit of the ATLAS collaboration
*/
//////////////////////////////////////////////////////////////////////
@@ -26,9 +26,7 @@ public:
StraightLineIntersector (const std::string& type,
const std::string& name,
const IInterface* parent);
- virtual ~StraightLineIntersector (void); // destructor
- virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
/**IIntersector interface method for general Surface type */
diff --git a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/StraightLineIntersector.cxx b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/StraightLineIntersector.cxx
index a0865085d256..4018678046a1 100755
--- a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/StraightLineIntersector.cxx
+++ b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/StraightLineIntersector.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2017, 2019, 2020 CERN for the benefit of the ATLAS collaboration
*/
//////////////////////////////////////////////////////////////////////
@@ -32,26 +32,10 @@ StraightLineIntersector::StraightLineIntersector (const std::string& type,
{
}
-StraightLineIntersector::~StraightLineIntersector (void)
-{}
-
-StatusCode
-StraightLineIntersector::initialize()
-{
- // print name and package version
- ATH_MSG_INFO( "StraightLineIntersector::initialize()"
- << " - package version " << PACKAGE_VERSION );
-
- // initialize base class
- if (StatusCode::SUCCESS != AlgTool::initialize()) return StatusCode::FAILURE;
-
- return StatusCode::SUCCESS;
-}
-
StatusCode
StraightLineIntersector::finalize()
{
- ATH_MSG_INFO( "finalized after " << m_countExtrapolations << " extrapolations" );
+ ATH_MSG_DEBUG( "finalized after " << m_countExtrapolations << " extrapolations" );
return StatusCode::SUCCESS;
}
--
GitLab