From edcd78ab460065e33319e19879acd3e0e42f93e6 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Fri, 4 Dec 2020 17:04:34 +0100
Subject: [PATCH] MaterialAllocator: Reduce initialize verbosity and use
ATH_CHECK
---
.../TrkiPatFitter/src/MaterialAllocator.cxx | 40 +++++--------------
1 file changed, 11 insertions(+), 29 deletions(-)
diff --git a/Tracking/TrkFitter/TrkiPatFitter/src/MaterialAllocator.cxx b/Tracking/TrkFitter/TrkiPatFitter/src/MaterialAllocator.cxx
index 427273883f5..ce3c21a6eed 100755
--- a/Tracking/TrkFitter/TrkiPatFitter/src/MaterialAllocator.cxx
+++ b/Tracking/TrkFitter/TrkiPatFitter/src/MaterialAllocator.cxx
@@ -82,8 +82,6 @@ namespace Trk
StatusCode
MaterialAllocator::initialize() {
- // print name and package version
- ATH_MSG_INFO("MaterialAllocator::initialize() - package version " << PACKAGE_VERSION);
// fill WARNING messages
m_messageHelper->setMaxNumberOfMessagesPrinted(m_maxWarnings);
@@ -99,45 +97,30 @@ namespace Trk
m_messageHelper->setMessage(5, "spectrometerMaterial: extrapolateM finds no material on track");
// retrieve the necessary Extrapolators (muon tracking geometry is very picky!)
- if (m_extrapolator.retrieve().isFailure()) {
- ATH_MSG_FATAL("Failed to retrieve tool " << m_extrapolator);
- return StatusCode::FAILURE;
- }
- ATH_MSG_INFO("Retrieved tool " << m_extrapolator);
-
- if (m_intersector.retrieve().isFailure()) {
- ATH_MSG_FATAL("Failed to retrieve tool " << m_intersector);
- return StatusCode::FAILURE;
- }
- ATH_MSG_INFO("Retrieved tool " << m_intersector);
+ ATH_CHECK( m_extrapolator.retrieve() );
+ ATH_MSG_DEBUG("Retrieved tool " << m_extrapolator);
+ ATH_CHECK( m_intersector.retrieve() );
+ ATH_MSG_DEBUG("Retrieved tool " << m_intersector);
// retrieve services
- if (m_trackingGeometrySvc.retrieve().isFailure()) {
- ATH_MSG_FATAL("Failed to retrieve Svc " << m_trackingGeometrySvc);
- return StatusCode::FAILURE;
- }
- ATH_MSG_INFO("Retrieved Svc " << m_trackingGeometrySvc);
+ ATH_CHECK( m_trackingGeometrySvc.retrieve() );
+ ATH_MSG_DEBUG("Retrieved Svc " << m_trackingGeometrySvc);
-
// need to create the IndetExit and MuonEntrance TrackingVolumes
- if (m_trackingVolumesSvc.retrieve().isFailure()) {
- ATH_MSG_FATAL("Failed to retrieve Svc " << m_trackingVolumesSvc);
- return StatusCode::FAILURE;
- }
- ATH_MSG_INFO("Retrieved Svc " << m_trackingVolumesSvc);
- m_calorimeterVolume = new Volume(
+ ATH_CHECK( m_trackingVolumesSvc.retrieve() );
+ ATH_MSG_DEBUG("Retrieved Svc " << m_trackingVolumesSvc);
+ m_calorimeterVolume = new Volume(
m_trackingVolumesSvc->volume(ITrackingVolumesSvc::MuonSpectrometerEntryLayer));
- m_indetVolume = new Volume(
+ m_indetVolume = new Volume(
m_trackingVolumesSvc->volume(ITrackingVolumesSvc::CalorimeterEntryLayer));
-
if (m_useStepPropagator > 0 && m_stepPropagator.retrieve().isFailure()) {
ATH_MSG_FATAL("Failed to retrieve Svc " << m_stepPropagator);
return StatusCode::FAILURE;
}
-// Field for StepPropagator
+ // Field for StepPropagator
m_stepField = Trk::MagneticFieldProperties(Trk::FullField);
if (m_useStepPropagator == 2) m_stepField = Trk::MagneticFieldProperties(Trk::FastField);
@@ -146,7 +129,6 @@ namespace Trk
StatusCode
MaterialAllocator::finalize() {
- ATH_MSG_INFO("finalize() ");
// summarize WARNINGs
m_messageHelper->printSummary();
--
GitLab