Skip to content
Snippets Groups Projects
Commit c8d45679 authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'TRT_CalibTools_fix_thread_warnings' into 'master'

TRT_CalibTools fix thread safety warnings

See merge request atlas/athena!34553
parents 06c3e70b 5d9bded9
No related branches found
No related tags found
No related merge requests found
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/********************************************************************
......@@ -70,13 +70,11 @@ bool FillAlignTrkInfo::fill(const Trk::Track* aTrack, TRT::TrackInfo* output,
(*output)[TRT::Track::degreesOfFreedom]=aTrack->fitQuality()->numberDoF();
// implicit memory allocation in createSummary, need to clean up later
const Trk::TrackSummary* summary = m_TrackSummaryTool->createSummary(*aTrack);
std::unique_ptr<Trk::TrackSummary> summary = m_TrackSummaryTool->summary(*aTrack);
(*output)[TRT::Track::numberOfPixelHits]=summary->get(Trk::numberOfPixelHits) ;
(*output)[TRT::Track::numberOfSCTHits]=summary->get(Trk::numberOfSCTHits) ;
(*output)[TRT::Track::numberOfTRTHits]=summary->get(Trk::numberOfTRTHits) ;
// fix to coverity 118333
delete summary;
// All ok
if (msgLvl(MSG::DEBUG)) msg() << "Track info filled .... " << endmsg;
......
......@@ -72,7 +72,7 @@ bool TRTCalibTrackSelectionTool::isAccepted(const Trk::Track* pTrack) const
float eta=-log(tan(theta/2));
if (m_EtaMin< m_EtaMax && (eta < m_EtaMin || eta > m_EtaMax) ) return false;
std::unique_ptr<const Trk::TrackSummary> summary(m_TrackSummaryTool->createSummary(*pTrack));
std::unique_ptr<const Trk::TrackSummary> summary = m_TrackSummaryTool->summary(*pTrack);
if(summary->get(Trk::numberOfTRTHits)<m_MinTRTHits) return false;
if(summary->get(Trk::numberOfPixelHits)<m_MinPixelHits) return false;
if(summary->get(Trk::numberOfSCTHits)<m_MinSCTHits) return false;
......
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