Skip to content
Snippets Groups Projects
Commit c4f9c722 authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'TrkCaloClusterROI_rem_alloc' into 'master'

TrkCaloClusterROI:  use ``localToglobalPos`` to avoid dynamic allocation

See merge request atlas/athena!34903
parents 699b6c7c af3fd792
No related branches found
No related tags found
No related merge requests found
...@@ -24,7 +24,6 @@ Trk::CaloClusterROI::CaloClusterROI( const Trk::LocalParameters* locpars, ...@@ -24,7 +24,6 @@ Trk::CaloClusterROI::CaloClusterROI( const Trk::LocalParameters* locpars,
m_etaWidth( widtheta ) m_etaWidth( widtheta )
{ {
m_surface = surface.isFree() ? surface.clone() : &surface; m_surface = surface.isFree() ? surface.clone() : &surface;
this->globalPosition();
} }
// Destructor: // Destructor:
...@@ -78,11 +77,10 @@ Trk::CaloClusterROI& Trk::CaloClusterROI::operator=(const Trk::CaloClusterROI& c ...@@ -78,11 +77,10 @@ Trk::CaloClusterROI& Trk::CaloClusterROI::operator=(const Trk::CaloClusterROI& c
Amg::Vector3D Trk::CaloClusterROI::globalPosition() const Amg::Vector3D Trk::CaloClusterROI::globalPosition() const
{ {
if(m_localParams){ if(m_localParams){
std::unique_ptr<const Amg::Vector3D> tmp_global(m_surface->localToGlobal(*m_localParams)); return m_surface->localToGlobalPos(*m_localParams);
return *tmp_global; // return "copy"
} }
if(m_surface){ if(m_surface){
return Amg::Vector3D(m_surface->center()); return m_surface->center();
} }
return Amg::Vector3D(); return Amg::Vector3D();
} }
......
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