diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/RungeKuttaIntersector.cxx b/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/RungeKuttaIntersector.cxx index 3d03b69aaf4fe0adc7fb1afdb8d609ec66fbdc7e..022ab47d4f78c696c5bcea1bb49da0a7e2148fdf 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 a16fc7b52090d259df8392983554f3c9b3d37c99..ed142d802a30dd85766154904e61cf288b8bb1b0 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 37ca2bfa21be21cb5b78ac78e162a2794ac8912a..4e589d59d2a5788a117580e40c606f7bfcb41e5e 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 a0865085d256749f50aed63efc064b7f80a4cdd7..4018678046a16aca24a12714ac5f56df71df3c75 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; }