From 6b0753fa6e107f005d9b01c074dec780cba5cbf0 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Mon, 13 May 2019 23:46:33 +0100
Subject: [PATCH] TrkParticleBase add ATLAS_CHECK_THREAD_SAFETY
---
.../TrkParticleBase/TrkParticleBase/ATLAS_CHECK_THREAD_SAFETY | 1 +
.../TrkParticleBase/TrkParticleBase/TrackParticleBase.h | 4 ++--
Tracking/TrkEvent/TrkParticleBase/src/TrackParticleBase.cxx | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
create mode 100644 Tracking/TrkEvent/TrkParticleBase/TrkParticleBase/ATLAS_CHECK_THREAD_SAFETY
diff --git a/Tracking/TrkEvent/TrkParticleBase/TrkParticleBase/ATLAS_CHECK_THREAD_SAFETY b/Tracking/TrkEvent/TrkParticleBase/TrkParticleBase/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 00000000000..f2928174d11
--- /dev/null
+++ b/Tracking/TrkEvent/TrkParticleBase/TrkParticleBase/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Tracking/TrkEvent/TrkParticleBase
diff --git a/Tracking/TrkEvent/TrkParticleBase/TrkParticleBase/TrackParticleBase.h b/Tracking/TrkEvent/TrkParticleBase/TrkParticleBase/TrackParticleBase.h
index e24d42affb2..1f6dc893c49 100755
--- a/Tracking/TrkEvent/TrkParticleBase/TrkParticleBase/TrackParticleBase.h
+++ b/Tracking/TrkEvent/TrkParticleBase/TrkParticleBase/TrackParticleBase.h
@@ -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
diff --git a/Tracking/TrkEvent/TrkParticleBase/src/TrackParticleBase.cxx b/Tracking/TrkEvent/TrkParticleBase/src/TrackParticleBase.cxx
index 7fd1980e976..fb69358c49e 100755
--- a/Tracking/TrkEvent/TrkParticleBase/src/TrackParticleBase.cxx
+++ b/Tracking/TrkEvent/TrkParticleBase/src/TrackParticleBase.cxx
@@ -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,
--
GitLab