diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonTGMeasAssocAlg/src/MuonTGMeasAssocAlg.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonTGMeasAssocAlg/src/MuonTGMeasAssocAlg.cxx index cf383eb45366df9a1ab8550fb128b12c9e8a4db5..3e54c1cda5f26f73a853d982ca1109db08755c97 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonTGMeasAssocAlg/src/MuonTGMeasAssocAlg.cxx +++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonTGMeasAssocAlg/src/MuonTGMeasAssocAlg.cxx @@ -172,10 +172,6 @@ StatusCode Muon::MuonTGMeasAssocAlg::execute() if ( !sc.isFailure() && m_writeTgSegments ) sc = storeSegments(); } - if ( m_muonTgTool ) { - m_muonTgTool->updateAssocMeas(m_allHits,m_allSegments); - } - return StatusCode::SUCCESS; } diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/MuonTGRecTools/IMuonTGMeasTool.h b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/MuonTGRecTools/IMuonTGMeasTool.h index 48286f5607e7286a0053604e210fe74b302b0237..7da479b7a49984c3c8a01242b6351366f57fb46e 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/MuonTGRecTools/IMuonTGMeasTool.h +++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/MuonTGRecTools/IMuonTGMeasTool.h @@ -1,23 +1,14 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ -/////////////////////////////////////////////////////////////////// -// IMuonTGMeasTool.h, (c) ATLAS Detector Softwareop -/////////////////////////////////////////////////////////////////// - #ifndef MUONTGRECTOOLS_IMUONTGMEASTOOL_H #define MUONTGRECTOOLS_IMUONTGMEASTOOL_H -// Gaudi #include "GaudiKernel/IAlgTool.h" - #include "TrkGeometry/TrackingGeometry.h" - #include "MuonTGRecTools/MuonTGHits.h" #include "MuonTGRecTools/MuonTGSegments.h" - -//Amg #include "EventPrimitives/EventPrimitives.h" namespace Muon{ @@ -42,7 +33,6 @@ public: static const InterfaceID& interfaceID() { return IID_IMuonTGMeasTool; }; - virtual void updateAssocMeas( MuonTGHits*, MuonTGSegments* ) const=0; virtual const std::vector<const Trk::PrepRawData*>* getMeasurementOnLayer(const Trk::Layer* lay) const=0; virtual const std::vector<const Trk::PrepRawData*>* getEtaPhiMeasurementOnLayer(const Trk::Layer* lay, bool phi) const=0; virtual const std::vector<const Trk::Segment*>* getSegments(const Trk::DetachedTrackingVolume* station) const=0; diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/MuonTGRecTools/MuonTGMeasurementTool.h b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/MuonTGRecTools/MuonTGMeasurementTool.h index ca3b9f8847a633105b53527113f2b5f136de785a..c057ed1b5ec1751ce1ec781267df1a479c36d602 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/MuonTGRecTools/MuonTGMeasurementTool.h +++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/MuonTGRecTools/MuonTGMeasurementTool.h @@ -61,7 +61,6 @@ public: virtual StatusCode initialize(); virtual StatusCode finalize(); - void updateAssocMeas( MuonTGHits*, MuonTGSegments* ) const; const std::vector<const Trk::PrepRawData*>* getMeasurementOnLayer(const Trk::Layer* lay) const; const std::vector<const Trk::PrepRawData*>* getEtaPhiMeasurementOnLayer(const Trk::Layer* lay, bool phi) const; const std::vector<const Trk::Segment*>* getSegments(const Trk::DetachedTrackingVolume* station) const; @@ -108,18 +107,7 @@ private: }; -} - -inline void Muon::MuonTGMeasurementTool::updateAssocMeas( Muon::MuonTGHits* assocHits, - Muon::MuonTGSegments* assocSegments ) const -{ - if (Gaudi::Concurrency::ConcurrencyFlags::concurrent()) { - ATH_MSG_WARNING("Access to Muon::MuonTGMeasurementTool::updateAssocMeas() blocked due to thread safety concerns"); - } else { - m_hits = assocHits; - m_segments = assocSegments; - } -} +} #endif //MUONTGRECTOOLS_MUONTGMEASUREMENTTOOL_H