Skip to content
Snippets Groups Projects
Commit 71cef089 authored by Christos Anastopoulos's avatar Christos Anastopoulos
Browse files

ATLASRECTS-5627: Use afrer move. Plus a few more clang-tidy fixes

parent 77d17bf8
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!35894ATLASRECTS-5627: Use afrer move. Plus a few more clang-tidy fixes
Hide whitespace changes
Inline Side-by-side
Tracking/TrkFitter/TrkRefitAlg/src/ReFitTrack.cxx
+ 55
− 52
View file @ 71cef089
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
......@@ -28,6 +28,8 @@
#include "VxVertex/VxContainer.h"
#include "VxVertex/RecVertex.h"
#include <memory>
#include <vector>
// Constructor with parameters:
......@@ -38,7 +40,7 @@ Trk::ReFitTrack::ReFitTrack(const std::string &name, ISvcLocator *pSvcLocator) :
m_runOutlier(false),
m_matEffects(3),
m_ParticleHypothesis(Trk::pion),
m_tracks(0),
m_tracks(nullptr),
m_ITrackFitter("TrkKalmanFitter/KalmanFitter"),
m_ITrackFitterTRT(""),
m_trkSummaryTool(""),
......@@ -47,7 +49,7 @@ Trk::ReFitTrack::ReFitTrack(const std::string &name, ISvcLocator *pSvcLocator) :
m_vxContainerName("VxPrimaryCandidate"),
m_extrapolator("Trk::Extrapolator/InDetExtrapolator"),
m_usetrackhypo(false)
{
{
// Get parameter values from jobOptions file
declareProperty("TrackName", m_trackName, "collection name for tracks to be refitted");
......@@ -64,7 +66,7 @@ Trk::ReFitTrack::ReFitTrack(const std::string &name, ISvcLocator *pSvcLocator) :
declareProperty("ConstrainFit", m_constrainFitMode,"mode switch if/how the track is constrained to the BS/Vx");
declareProperty("VertexCollection", m_vxContainerName,"Source for vertex to use for constraining tracks");
declareProperty("Extrapolator", m_extrapolator, "Extrapolator needed for coherent measurement frame.");
}
......@@ -76,10 +78,10 @@ StatusCode Trk::ReFitTrack::initialize()
if (m_ITrackFitter.retrieve().isFailure()) {
msg(MSG::FATAL) << "Failed to retrieve tool "<<m_ITrackFitter.typeAndName()<<endmsg;
return StatusCode::FAILURE;
} else
} else
msg(MSG::INFO) << "Retrieved general fitter " << m_ITrackFitter.typeAndName() << endmsg;
if (m_ITrackFitterTRT.name()!=""){
if (!m_ITrackFitterTRT.name().empty()){
if (m_ITrackFitterTRT.retrieve().isFailure()) {
msg(MSG::FATAL) << "Failed to retrieve tool " << m_ITrackFitterTRT.typeAndName()<<endmsg;
return StatusCode::FAILURE;
......@@ -87,7 +89,7 @@ StatusCode Trk::ReFitTrack::initialize()
msg(MSG::INFO) << "Retrieved fitter for TRT-only tracks " << m_ITrackFitterTRT.typeAndName() << endmsg;
}
if (m_trkSummaryTool.name()!=""){
if (!m_trkSummaryTool.name().empty()){
if (m_trkSummaryTool.retrieve().isFailure()) {
msg(MSG::FATAL) << "Failed to retrieve tool " << m_trkSummaryTool << endmsg;
return StatusCode::FAILURE;
......@@ -98,26 +100,26 @@ StatusCode Trk::ReFitTrack::initialize()
msg(MSG::FATAL) << "Failed to retrieve tool " << m_assoTool << endmsg;
return StatusCode::FAILURE;
} else ATH_MSG_INFO("Retrieved tool " << m_assoTool);
if (!m_trkSelectorTool.empty()){
if (m_trkSelectorTool.retrieve().isFailure()) {
msg(MSG::FATAL) << "Failed to retrieve tool " << m_trkSelectorTool << ". No Track Selection will be done." << endmsg;
return StatusCode::FAILURE;
} else
msg(MSG::INFO) << "Retrieved tool " << m_trkSelectorTool.typeAndName() << endmsg;
msg(MSG::INFO) << "Retrieved tool " << m_trkSelectorTool.typeAndName() << endmsg;
}
// beam conditions service
if (m_constrainFitMode) {
ATH_CHECK(m_beamSpotKey.initialize());
}
// extrapolator
if (m_constrainFitMode && m_extrapolator.retrieve().isFailure()){
ATH_MSG_FATAL( "Failed to retrieve " << m_extrapolator );
return StatusCode::FAILURE;
}
// Configuration of the material effects
Trk::ParticleSwitcher particleSwitch;
m_ParticleHypothesis = particleSwitch.particle[m_matEffects];
......@@ -132,7 +134,7 @@ StatusCode Trk::ReFitTrack::initialize()
}
// Execute method:
StatusCode Trk::ReFitTrack::execute()
StatusCode Trk::ReFitTrack::execute()
{
ATH_MSG_DEBUG ("ReFitTrack::execute()");
std::unique_ptr<Trk::PRDtoTrackMap> prd_to_track_map(m_assoTool->createPRDtoTrackMap());
......@@ -140,10 +142,10 @@ StatusCode Trk::ReFitTrack::execute()
SG::ReadHandle<TrackCollection> tracks (m_trackName);
if (!tracks.isValid()){
msg(MSG::ERROR) <<"Track collection named " << m_trackName.key()
msg(MSG::ERROR) <<"Track collection named " << m_trackName.key()
<< " not found, exit ReFitTrack." << endmsg;
return StatusCode::SUCCESS;
} else {
} else {
ATH_MSG_DEBUG ("Tracks collection '" << m_trackName.key() << "' retrieved from EventStore.");
}
......@@ -151,17 +153,17 @@ StatusCode Trk::ReFitTrack::execute()
// Handle the various possible constraints.
std::unique_ptr<const Trk::PerigeeSurface> constrainSf;
std::unique_ptr<const Trk::RecVertex> constrainVx;
if (m_constrainFitMode > 0){
std::unique_ptr<const Trk::RecVertex> constrainVx;
if (m_constrainFitMode > 0){
constrainVx.reset( setupConstrainedFit() );
}
// constrain surface (either BS of VTX)
if (constrainVx) {
constrainSf.reset( new Trk::PerigeeSurface(constrainVx->position()));
constrainSf = std::make_unique<Trk::PerigeeSurface>( constrainVx->position());
}
ParticleHypothesis hypo=m_ParticleHypothesis;
// create new collection of tracks to write in storegate
......@@ -176,15 +178,15 @@ StatusCode Trk::ReFitTrack::execute()
if (m_usetrackhypo) hypo=(**itr).info().particleHypothesis();
std::unique_ptr<Trk::Track> newtrack;
bool trtonly=false;
bool passedSelection = true;
bool passedSelection = true;
// check whether the track passes the selection
if (*itr && !m_trkSelectorTool.empty()){
if (*itr && !m_trkSelectorTool.empty()){
passedSelection = m_trkSelectorTool->decision(**itr);
}
if (m_ITrackFitterTRT.name()!="" && m_trkSummaryTool.name()!=""){
if (!m_ITrackFitterTRT.name().empty() && !m_trkSummaryTool.name().empty()){
ATH_MSG_VERBOSE ("Creating summary");
// @TODO does not need PRDtoTrackMap
unsigned int n_trt_hits;
......@@ -203,7 +205,7 @@ StatusCode Trk::ReFitTrack::execute()
ATH_MSG_VERBOSE ("Passed selection");
const Trk::Perigee* origPerigee = (*itr)->perigeeParameters();
if (origPerigee){
if (origPerigee){
double od0 = origPerigee->parameters()[Trk::d0];
double oz0 = origPerigee->parameters()[Trk::z0];
double ophi0 = origPerigee->parameters()[Trk::phi0];
......@@ -214,29 +216,29 @@ StatusCode Trk::ReFitTrack::execute()
// create a measurement for the beamspot
if (constrainVx && origPerigee){
ATH_MSG_VERBOSE ("Creating measurement for beamspot.");
// extrapolate the track to the vertex -- for consistent Measurement frame
std::unique_ptr<const Trk::TrackParameters> tp( m_extrapolator->extrapolate(**itr,*constrainSf,Trk::anyDirection) );
const Trk::Perigee* tpConstrainedSf = dynamic_cast<const Trk::Perigee*>(tp.get());
// create the vertex/beamsptOnTrack
std::unique_ptr<Trk::VertexOnTrack> bsvxOnTrack( tpConstrainedSf ? new Trk::VertexOnTrack(*constrainVx,*tpConstrainedSf) : 0 );
std::unique_ptr<Trk::VertexOnTrack> bsvxOnTrack( tpConstrainedSf ? new Trk::VertexOnTrack(*constrainVx,*tpConstrainedSf) : nullptr );
std::vector<const MeasurementBase*> vec;
if (tpConstrainedSf) vec.push_back(bsvxOnTrack.get() );
// get the measurmentsOnTrack
const DataVector<const MeasurementBase>* measurementsOnTracks = (**itr).measurementsOnTrack();
// get the outliersOnTrack, needs sorting
const DataVector<const MeasurementBase>* measurementsOnTracks = (**itr).measurementsOnTrack();
// get the outliersOnTrack, needs sorting
//!< @todo : include sorting of outliers
// clone measurements and outliers into the track
DataVector<const MeasurementBase>::const_iterator measIter = measurementsOnTracks->begin();
DataVector<const MeasurementBase>::const_iterator measIterEnd = measurementsOnTracks->end();
for ( ; measIter != measIterEnd; ++measIter)
for ( ; measIter != measIterEnd; ++measIter)
vec.push_back((*measIter));
// if - protect the outliers ...
// const DataVector<const MeasurementBase>* outliersOnTracks = (**itr).outliersOnTrack();
// const DataVector<const MeasurementBase>* outliersOnTracks = (**itr).outliersOnTrack();
// measIter = outliersOnTracks->begin();
// measIterEnd = outliersOnTracks->end();
// for ( ; measIter != measIterEnd; ++measIter)
// for ( ; measIter != measIterEnd; ++measIter)
// vec.push_back((*measIter));
// refit with the beamspot / vertex
newtrack.reset((trtonly ? m_ITrackFitterTRT : m_ITrackFitter)->fit(vec, *origPerigee, m_runOutlier,hypo));
......@@ -246,8 +248,6 @@ StatusCode Trk::ReFitTrack::execute()
}
} // passed selection
if (newtrack) new_tracks.push_back(std::move(newtrack));
if (msgLvl(MSG::DEBUG)) {
if (!newtrack) ATH_MSG_DEBUG ("Refit Failed");
else {
......@@ -255,7 +255,7 @@ StatusCode Trk::ReFitTrack::execute()
// ATH_MSG_VERBOSE ("re-fitted track:" << *newtrack);
const Trk::Perigee *aMeasPer=
dynamic_cast<const Trk::Perigee*>(newtrack->perigeeParameters () );
if (aMeasPer==0){
if (aMeasPer==nullptr){
msg(MSG::ERROR) << "Could not get Trk::MeasuredPerigee" << endmsg;
continue;
}
......@@ -267,6 +267,11 @@ StatusCode Trk::ReFitTrack::execute()
ATH_MSG_DEBUG ("Refitted parameters " << d0 << " " << z0 << " " << phi0 << " " << theta << " " << qOverP);
}
}
if (newtrack) {
new_tracks.push_back(std::move(newtrack));
}
}
ATH_MSG_VERBOSE ("Add PRDs to assoc tool.");
......@@ -277,12 +282,10 @@ StatusCode Trk::ReFitTrack::execute()
}
ATH_MSG_VERBOSE ("Recalculate the summary");
// and copy tracks from vector of non-const tracks to collection of const tracks
// and copy tracks from vector of non-const tracks to collection of const tracks
std::unique_ptr<TrackCollection> new_track_collection = std::make_unique<TrackCollection>();
new_track_collection->reserve(new_tracks.size());
// now recalculate the summary ... the usual nasty const cast is needed here
for(std::unique_ptr<Trk::Track> &new_track : new_tracks ) {
// @TODO need solution which does not modify the Track
m_trkSummaryTool->computeAndReplaceTrackSummary(*new_track, prd_to_track_map.get(), false /* DO NOT suppress hole search*/);
new_track_collection->push_back(std::move(new_track));
}
......@@ -294,7 +297,7 @@ StatusCode Trk::ReFitTrack::execute()
}
// Finalize method:
StatusCode Trk::ReFitTrack::finalize()
StatusCode Trk::ReFitTrack::finalize()
{
msg(MSG::INFO) << "ReFitTrack::finalize()" << endmsg;
return StatusCode::SUCCESS;
......@@ -303,15 +306,15 @@ StatusCode Trk::ReFitTrack::finalize()
const Trk::RecVertex* Trk::ReFitTrack::setupConstrainedFit()
{
// constrainVx
const Trk::RecVertex* constrainVx = 0;
const Trk::RecVertex* constrainVx = nullptr;
if ( m_constrainFitMode == 2 ){
// Beamspot mode
SG::ReadCondHandle<InDet::BeamSpotData> beamSpotHandle { m_beamSpotKey };
// get vertex position and uncertainties from BeamCondSvc
constrainVx = new Trk::RecVertex(beamSpotHandle->beamVtx());
ATH_MSG_DEBUG("Track fit with BeamSpot constraint (x/y/z) = "
<< constrainVx->position().x() << ", "
<< constrainVx->position().y() << ", "
constrainVx = new Trk::RecVertex(beamSpotHandle->beamVtx());
ATH_MSG_DEBUG("Track fit with BeamSpot constraint (x/y/z) = "
<< constrainVx->position().x() << ", "
<< constrainVx->position().y() << ", "
<< constrainVx->position().z());
} else if (m_constrainFitMode ==1){
// Vertex mode
......@@ -324,10 +327,10 @@ const Trk::RecVertex* Trk::ReFitTrack::setupConstrainedFit()
} else {
// only refit to the 'signal' vertex
constrainVx = new Trk::RecVertex( (*vxContainer)[0]->recVertex() ); // Just copy it to simplify ownership.
ATH_MSG_DEBUG("Track fit with Vertex constraint (x/y/z) = "
<< constrainVx->position().x() << ", "
<< constrainVx->position().y() << ", "
<< constrainVx->position().z());
ATH_MSG_DEBUG("Track fit with Vertex constraint (x/y/z) = "
<< constrainVx->position().x() << ", "
<< constrainVx->position().y() << ", "
<< constrainVx->position().z());
}
} else {
ATH_MSG_WARNING("Unknown constraint mode: "<< m_constrainFitMode);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment