From 94514e4edbfdabff37e2e4a15d464190ba50c2bb Mon Sep 17 00:00:00 2001
From: Tamara Vazquez Schroeder <tamara.vazquez.schroeder@cern.ch>
Date: Wed, 6 Jun 2018 17:55:45 +0000
Subject: [PATCH] Revert "Merge branch 'ATLASRECTS_4483' into '21.0'"
This reverts merge request !11746
Former-commit-id: 5c0a2e8316bbc25a127cf47df5cba7011da7a45c
---
.../MuonTrackFinderTools/src/MuonTrackCleaner.cxx | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.cxx
index bb5f2898701..fc8052264ae 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.cxx
@@ -938,18 +938,17 @@ namespace Muon {
bool remove = hit->chId == chId && ( (removePhi && measuresPhi) || (removeEta && !measuresPhi) );
// hits that are flagged as outlier or hits in the chamber to be removed are added as Outlier
if( !hit->useInFit || remove ){
+ hit->useInFit = 0;
if( msgLvl(MSG::DEBUG) && remove ) msg() << MSG::DEBUG << " removing hit " << m_idHelper->toString(hit->id)
<< " pull " << hit->resPull->pull().front() << endmsg;
// add as outlier
if( hit->inBounds ) tsos->push_back( MuonTSOSHelper::cloneTSOSWithUpdate( *hit->originalState,
- *hit->meas,
- *hit->pars,
- Trk::TrackStateOnSurface::Outlier) );
+ *hit->meas,
+ *hit->pars,
+ Trk::TrackStateOnSurface::Outlier) );
// if removed, add hit to vector of hits
- //but only if the hit was not already an outlier to be skipped!
- if( remove && hit->useInFit) result.removedHits.push_back(&*hit);
- hit->useInFit = 0;
+ if( remove ) result.removedHits.push_back(&*hit);
continue;
}
}
@@ -968,12 +967,12 @@ namespace Muon {
// fit new track
if ( msgLvl(MSG::DEBUG) ) {
- const DataVector<const Trk::TrackStateOnSurface>* states = cleanedTrack->trackStateOnSurfaces();
+ const DataVector<const Trk::TrackStateOnSurface>* states = track.trackStateOnSurfaces();
int nStates = 0;
if ( states ) nStates = states->size();
msg() << MSG::DEBUG << "removeChamber: Calling fit with hits: " << nStates;
if ( msgLvl(MSG::VERBOSE) ) {
- msg() << MSG::VERBOSE << std::endl << m_printer->printMeasurements( *cleanedTrack );
+ msg() << MSG::VERBOSE << std::endl << m_printer->printMeasurements( track );
}
msg() << endmsg;
if( !cleanedTrack->perigeeParameters() ){
--
GitLab