Skip to content
Snippets Groups Projects
Commit f796db94 authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'RemovePVLink' into 'main'

MuonReadoutElement - Remove PVLink in constructor

See merge request !68849
parents 43c187e7 8e40c110
No related branches found
No related tags found
1 merge request!68849MuonReadoutElement - Remove PVLink in constructor
/*
Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
......@@ -140,7 +140,7 @@ namespace MuonGM {
Trk::DetectorElemType detectorType() const override final { return m_type; }
protected:
MuonReadoutElement(GeoPVLink pv, MuonDetectorManager* mgr, Trk::DetectorElemType detType);
MuonReadoutElement(GeoVFullPhysVol* pv, MuonDetectorManager* mgr, Trk::DetectorElemType detType);
double m_Ssize{-9999.};
double m_Rsize{-9999.};
......@@ -163,7 +163,6 @@ namespace MuonGM {
void setIndexOfREinMuonStation();
ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc{"Muon::MuonIdHelperSvc/MuonIdHelperSvc", "MuonDetectorManager"};
PVLink m_physVol{nullptr};
Trk::DetectorElemType m_type{Trk::DetectorElemType::SolidState};
Identifier m_id{0}; //!< extended data-collection identifier
IdentifierHash m_idhash{0}; //!< data-collection hash identifier
......
......@@ -31,10 +31,9 @@ namespace {
}
namespace MuonGM {
MuonReadoutElement::MuonReadoutElement(GeoPVLink pv, MuonDetectorManager* mgr, Trk::DetectorElemType detType) :
TrkDetElementBase(dynamic_cast<GeoVFullPhysVol*>(pv.operator->())),
MuonReadoutElement::MuonReadoutElement(GeoVFullPhysVol* pv, MuonDetectorManager* mgr, Trk::DetectorElemType detType) :
TrkDetElementBase(pv),
AthMessaging{to_string(detType)+"MuonReadoutElement"},
m_physVol{pv},
m_type{detType},
m_muon_mgr{mgr} {
if (!m_idHelperSvc.retrieve().isSuccess()) {
......
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