Skip to content
Snippets Groups Projects
Commit a227cc7a authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'somefixes' into 'master'

Fix unnecessary copies

See merge request atlas/athena!27260
parents fe32e9bd da2b61c4
No related branches found
No related tags found
No related merge requests found
...@@ -110,12 +110,12 @@ StatusCode MooSegmentFinderAlg::execute() ...@@ -110,12 +110,12 @@ StatusCode MooSegmentFinderAlg::execute()
m_segmentFinder->findSegments( mdtCols, cscCols, tgcCols, rpcCols, output ); m_segmentFinder->findSegments( mdtCols, cscCols, tgcCols, rpcCols, output );
if(output.patternCombinations){ if(output.patternCombinations){
if( patHandle.record(std::make_unique<MuonPatternCombinationCollection>(std::move(*(output.patternCombinations)))).isSuccess() ){ if( patHandle.record(std::unique_ptr<MuonPatternCombinationCollection>(output.patternCombinations)).isSuccess() ){
ATH_MSG_VERBOSE("stored MuonPatternCombinationCollection at " << m_patternCombiLocation.key()); ATH_MSG_VERBOSE("stored MuonPatternCombinationCollection at " << m_patternCombiLocation.key());
}else{ }else{
ATH_MSG_ERROR("Failed to store MuonPatternCombinationCollection at " << m_patternCombiLocation.key()); ATH_MSG_ERROR("Failed to store MuonPatternCombinationCollection at " << m_patternCombiLocation.key());
} }
delete output.patternCombinations; output.patternCombinations = nullptr;
} }
else{ else{
if( patHandle.record(std::make_unique<MuonPatternCombinationCollection>()).isSuccess() ){ if( patHandle.record(std::make_unique<MuonPatternCombinationCollection>()).isSuccess() ){
......
...@@ -358,11 +358,11 @@ void T2VertexBeamSpotTool::reconstructVertices( ConstDataVector<TrackCollection> ...@@ -358,11 +358,11 @@ void T2VertexBeamSpotTool::reconstructVertices( ConstDataVector<TrackCollection>
// Extract beam spot parameters // Extract beam spot parameters
SG::ReadCondHandle<InDet::BeamSpotData> beamSpotHandle { m_beamSpotKey }; SG::ReadCondHandle<InDet::BeamSpotData> beamSpotHandle { m_beamSpotKey };
auto beamSpot = std::make_unique<T2BeamSpot>(*beamSpotHandle); T2BeamSpot beamSpot(*beamSpotHandle);
ATH_MSG_DEBUG( "Beamspot from BeamCondSvc: " << *beamSpot); ATH_MSG_DEBUG( "Beamspot from BeamCondSvc: " << beamSpot);
const T2Vertex myVertex( *primaryVertex, vertexTracks.get(), *beamSpot, m_trackClusterer->seedZ0() ); const T2Vertex myVertex( *primaryVertex, vertexTracks.get(), beamSpot, m_trackClusterer->seedZ0() );
// Monitor all vertices parameters // Monitor all vertices parameters
monitor_vertex( "Vertex", "", myVertex ); monitor_vertex( "Vertex", "", myVertex );
......
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