Skip to content
Snippets Groups Projects
Commit f5ad1a20 authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'TrackParticleBase_ATLAS_CHECK_THREAD_SAFETY' into 'master'

TrkParticleBase add ATLAS_CHECK_THREAD_SAFETY

See merge request atlas/athena!23393
parents 5681139c 6b0753fa
No related branches found
No related tags found
No related merge requests found
Tracking/TrkEvent/TrkParticleBase
......@@ -170,7 +170,7 @@ namespace Trk
ElementLink< VxContainer > m_elVxCandidate;
/** DataVector of TrackParameters stored inside this TrackParticle. (This TrackParticleBase owns all the TrackParameters, and will delete them in the destructor)*/
mutable std::vector<const TrackParameters*> m_trackParameters;
std::vector<const TrackParameters*> m_trackParameters;
/** the summary of this TrackParticle. Owned by this object.*/
const TrackSummary* m_trackSummary;
......@@ -269,7 +269,7 @@ namespace Trk
void TrackParticleBase::setTrackLink ( const TrackCollection * cont, const Track * track)
{
if ( m_originalTrack.isValid() ) m_originalTrack.reset();
m_originalTrack.toContainedElement( *cont, const_cast<Track*> (track));
m_originalTrack.toContainedElement( *cont, track);
}
inline const TrackInfo& TrackParticleBase::info() const
......
......@@ -59,10 +59,10 @@ namespace Trk
// establish element links
if (trk!=0)
{
m_originalTrack.setElement(const_cast<Track*>(trk));
m_originalTrack.setElement(trk);
m_trackInfo = trk->info();
}
if (vxCandidate!=0) m_elVxCandidate.setElement(const_cast<VxCandidate*>(vxCandidate));
if (vxCandidate!=0) m_elVxCandidate.setElement(vxCandidate);
}
TrackParticleBase::TrackParticleBase( const ElementLink<TrackCollection>& trackLink,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment