diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx index cf1fe8f132383156bb9d495bbf390ff3a2537b5a..9345d5eaddd1eccf7a3448fd637cc4f7bff6dc7f 100755 --- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx +++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx @@ -2046,7 +2046,7 @@ namespace InDet myTwoTrackVerticesInJet, mySelectedTracksInJet); - myOutputInfo->getSVOwnership(true); + myOutputInfo->setSVOwnership(true); delete signalVertex; diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondary.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondary.cxx index 07a4c03ecd998f97f8c5a518274cd0c006f119ff..5763e49b3a38f801345d5d538f70006f57decdd0 100644 --- a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondary.cxx +++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondary.cxx @@ -401,7 +401,7 @@ namespace InDet { m_secVertexInfo->vertices().front()->setVertexType((xAOD::VxType::VertexType)2); } m_secVertexInfoContainer->push_back(const_cast<Trk::VxSecVertexInfo*>(m_secVertexInfo)); - m_secVertexInfoContainer->back()->getSVOwnership(true); + m_secVertexInfoContainer->back()->setSVOwnership(true); m_nVxSecVertexInfo++; } if(outputLevel <= MSG::DEBUG) { diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondaryCombo.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondaryCombo.cxx index c5735bf19da2fe430bc303867007b39b1dbddaa9..8d406973cc6c4c04e0a990f521a4cc4ef5e15ffb 100644 --- a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondaryCombo.cxx +++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondaryCombo.cxx @@ -434,7 +434,7 @@ namespace InDet { } m_secVertexInfoContainer->push_back(const_cast<Trk::VxSecVertexInfo*>(m_secVertexInfo)); - m_secVertexInfoContainer->back()->getSVOwnership(true); + m_secVertexInfoContainer->back()->setSVOwnership(true); m_nVxSecVertexInfo++; } diff --git a/PhysicsAnalysis/PhysicsValidation/VKalVrtValidation/src/TestCascadeAlg.cxx b/PhysicsAnalysis/PhysicsValidation/VKalVrtValidation/src/TestCascadeAlg.cxx index dc3ff419731e593e1bcef06b3bae503852b8fae7..a04b2c92805b12d1f4019f3ab6a55f118b53cacd 100644 --- a/PhysicsAnalysis/PhysicsValidation/VKalVrtValidation/src/TestCascadeAlg.cxx +++ b/PhysicsAnalysis/PhysicsValidation/VKalVrtValidation/src/TestCascadeAlg.cxx @@ -98,7 +98,7 @@ StatusCode TestCascadeAlg::execute() { } std::unique_ptr<Trk::VxCascadeInfo> result(m_iVertexFitter->fitCascade(*state)); if(result) { - result->getSVOwnership(true); + result->setSVOwnership(true); const std::vector< std::vector<TLorentzVector> > &moms = result->getParticleMoms(); for(auto& p :moms) { ATH_MSG_DEBUG("new part"); for(auto &l : p) ATH_MSG_DEBUG("vect " << l.M()); } pereventcount++; diff --git a/Tracking/TrkEvent/VxSecVertex/VxSecVertex/VxSecVertexInfo.h b/Tracking/TrkEvent/VxSecVertex/VxSecVertex/VxSecVertexInfo.h index 48b0e860f34a8bf8f24b1d14c0166f2525e150ae..50d3793ae056fbe25376cfd62b75368060e36591 100755 --- a/Tracking/TrkEvent/VxSecVertex/VxSecVertex/VxSecVertexInfo.h +++ b/Tracking/TrkEvent/VxSecVertex/VxSecVertex/VxSecVertexInfo.h @@ -22,7 +22,7 @@ given by a vector of VxCandidate*. The class OWNS the VxCandidate. Pointers May 2014: VxSecVertexInfo doesn't own the corresponding secondary vertices anymore by default. Beware - this leads to a strong memory leak if SV are not explictly deleted before VxSecVertexInfo destructor. - VxSecVertexInfo gets back the SV ownership if getSVOwnership(true) is called. + VxSecVertexInfo gets back the SV ownership if setSVOwnership(true) is called. *****************************************/ @@ -70,11 +70,7 @@ namespace Trk { /* set the list of Vertices */ void setVertices(const std::vector<xAOD::Vertex*> &); - /* non MT safe setter with get in its name ...*/ - void getSVOwnership ATLAS_NOT_THREAD_SAFE(bool Ownership) const { - const_cast<bool&> (m_SVOwnership)=Ownership;/*Marked ATLAS_NOT_THREAD_SAFE*/ - } - /* set Ownership */ + /* set Ownership */ void setSVOwnership (bool Ownership) { m_SVOwnership=Ownership; }