Commit b5983e30 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'clang.TrkKalmanFitter-20210928' into 'master'

TrkKalmanFitter: Fix clang warnings.

See merge request atlas/athena!46788
parents 88366880 246d1997
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
......@@ -435,7 +435,7 @@ Trk::KalmanPiecewiseAnnealingFilter::filterTrajectoryPiece
ATH_MSG_VERBOSE ("Added material effects.");
}
const AmgVector(5) x = input_it->referenceParameters()->parameters()+(*predDiffPar);
predPar = std::move(CREATE_PARAMETERS(*input_it->referenceParameters(),x,C));
predPar = CREATE_PARAMETERS(*input_it->referenceParameters(),x,C);
ATH_MSG_DEBUG("used difference to make predpar = " << *predPar);
}
}
......@@ -504,10 +504,10 @@ Trk::KalmanPiecewiseAnnealingFilter::filterTrajectoryPiece
} else {
m_trajPiece.back().checkinForwardPar(std::move(predPar));
FitQualityOnSurface* fitQuality=nullptr;
updatedPar = std::move( m_updator->addToState(*predPar,
updatedPar = m_updator->addToState(*predPar,
m_trajPiece.back().measurement()->localParameters(),
m_trajPiece.back().measurement()->localCovariance(),
fitQuality));
fitQuality);
if (!updatedPar) {
ATH_MSG_DEBUG ("addToState failed in filterTrajPiece(), annealing "<<beta);
m_trajPiece.clear();
......
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//////////////////////////////////////////////////////////////////
......@@ -393,13 +393,13 @@ Trk::FitterStatusCode Trk::KalmanSmoother::fit(Trk::Trajectory& tra
ATH_MSG_VERBOSE ("Identified state" << (rit->positionOnTrajectory()>9? " " : " 0")<<
rit->positionOnTrajectory() << " as last fittable state.");
//clone here, as updatedPar is used on next iteration and would be invalid if moved
smooPar=std::move( updatedPar->uniqueClone() );
smooPar=updatedPar->uniqueClone();
} else {
if (m_doSmoothing) {
forwardTPar = rit->forwardTrackParameters();
smooPar = m_updator->combineStates(*forwardTPar, *updatedPar);
} else {
smooPar=std::move(updatedPar->uniqueClone() );
smooPar=updatedPar->uniqueClone();
}
}
if (!smooPar) {
......
Markdown is supported
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