From 59f71570eb520ed2aced017bb814f8aac485b058 Mon Sep 17 00:00:00 2001 From: scott snyder Date: Tue, 17 May 2022 18:10:49 +0200 Subject: [PATCH 1/2] METReconstruction: Fix clang warnings. Missing override keywords. --- .../METReconstruction/METJetAssocTool.h | 15 ++++++++++----- .../METReconstruction/METSoftTermsTool.h | 11 +++++++---- .../METReconstruction/METTruthTool.h | 11 +++++++---- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/Reconstruction/MET/METReconstruction/METReconstruction/METJetAssocTool.h b/Reconstruction/MET/METReconstruction/METReconstruction/METJetAssocTool.h index f6f181be522..5015100d173 100644 --- a/Reconstruction/MET/METReconstruction/METReconstruction/METJetAssocTool.h +++ b/Reconstruction/MET/METReconstruction/METReconstruction/METJetAssocTool.h @@ -53,25 +53,30 @@ namespace met{ /////////////////////////////////////////////////////////////////// protected: - StatusCode executeTool(xAOD::MissingETContainer* metCont, xAOD::MissingETAssociationMap* metMap) const; + virtual + StatusCode executeTool(xAOD::MissingETContainer* metCont, xAOD::MissingETAssociationMap* metMap) const override; + virtual StatusCode extractPFO(const xAOD::IParticle*, std::vector&, const met::METAssociator::ConstitHolder&, - std::map&) const + std::map&) const override {return StatusCode::FAILURE;} // should not be called + virtual StatusCode extractFE(const xAOD::IParticle*, std::vector&, const met::METAssociator::ConstitHolder&, - std::map&) const + std::map&) const override {return StatusCode::FAILURE;} // should not be called + virtual StatusCode extractTracks(const xAOD::IParticle*, std::vector&, - const met::METAssociator::ConstitHolder&) const + const met::METAssociator::ConstitHolder&) const override {return StatusCode::FAILURE;} // should not be called + virtual StatusCode extractTopoClusters(const xAOD::IParticle*, std::vector&, - const met::METAssociator::ConstitHolder&) const + const met::METAssociator::ConstitHolder&) const override {return StatusCode::FAILURE;} // should not be called private: diff --git a/Reconstruction/MET/METReconstruction/METReconstruction/METSoftTermsTool.h b/Reconstruction/MET/METReconstruction/METReconstruction/METSoftTermsTool.h index 19f62076ec2..eb52fcf6246 100644 --- a/Reconstruction/MET/METReconstruction/METReconstruction/METSoftTermsTool.h +++ b/Reconstruction/MET/METReconstruction/METReconstruction/METSoftTermsTool.h @@ -52,17 +52,20 @@ namespace met{ // AsgTool Hooks virtual StatusCode initialize() override; - protected: - StatusCode executeTool(xAOD::MissingET* metTerm, xAOD::MissingETComponentMap* metMap) const; + protected: + virtual + StatusCode executeTool(xAOD::MissingET* metTerm, xAOD::MissingETComponentMap* metMap) const override; // Accept functions - bool accept (const xAOD::IParticle* object) const; + virtual + bool accept (const xAOD::IParticle* object) const override; bool accept (const xAOD::CaloCluster* clus) const; bool accept (const xAOD::TrackParticle* trk) const; // Overlap resolver function + virtual bool resolveOverlap (const xAOD::IParticle* object, xAOD::MissingETComponentMap* metMap, std::vector& acceptedSignals, - MissingETBase::Types::weight_t& objWeight) const; + MissingETBase::Types::weight_t& objWeight) const override; bool resolveOverlap (xAOD::MissingETComponentMap* metMap, std::vector& acceptedSignals) const; diff --git a/Reconstruction/MET/METReconstruction/METReconstruction/METTruthTool.h b/Reconstruction/MET/METReconstruction/METReconstruction/METTruthTool.h index 9eb7656cb34..3eee269face 100644 --- a/Reconstruction/MET/METReconstruction/METReconstruction/METTruthTool.h +++ b/Reconstruction/MET/METReconstruction/METReconstruction/METTruthTool.h @@ -61,19 +61,22 @@ namespace met{ /////////////////////////////////////////////////////////////////// // Private data: /////////////////////////////////////////////////////////////////// - protected: - StatusCode executeTool(xAOD::MissingET* metTerm, xAOD::MissingETComponentMap* metMap) const; + protected: + virtual + StatusCode executeTool(xAOD::MissingET* metTerm, xAOD::MissingETComponentMap* metMap) const override; // Accept functions - bool accept (const xAOD::IParticle* object) const; + virtual + bool accept (const xAOD::IParticle* object) const override; bool accept_nonint (const xAOD::TruthParticle* truth) const; bool accept_int (const xAOD::TruthParticle* truth) const; bool accept_intout (const xAOD::TruthParticle* truth) const; bool accept_intmuons (const xAOD::TruthParticle* truth) const; // Overlap resolver function + virtual bool resolveOverlap (const xAOD::IParticle*, xAOD::MissingETComponentMap*, std::vector&, - MissingETBase::Types::weight_t&) const { return true;}; + MissingETBase::Types::weight_t&) const override { return true;}; private: // Default constructor: -- GitLab From 7ce96b25af92d0b9b9c9710bab474b02918a6bbf Mon Sep 17 00:00:00 2001 From: scott snyder Date: Tue, 17 May 2022 18:14:57 +0200 Subject: [PATCH 2/2] MMClusterization: Fix clang warnings. Missing override keywords. --- .../src/ClusterTimeProjectionMMClusterBuilderTool.h | 3 ++- .../MMClusterization/src/UTPCMMClusterBuilderTool.h | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/ClusterTimeProjectionMMClusterBuilderTool.h b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/ClusterTimeProjectionMMClusterBuilderTool.h index c00008dc822..4bb3e2c47a4 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/ClusterTimeProjectionMMClusterBuilderTool.h +++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/ClusterTimeProjectionMMClusterBuilderTool.h @@ -28,8 +28,9 @@ class ClusterTimeProjectionMMClusterBuilderTool : StatusCode getClusters(std::vector& MMprds, std::vector>& clustersVec) const override; + virtual StatusCode getCalibratedClusterPosition(const Muon::MMPrepData* cluster, std::vector&, - const float theta, Amg::Vector2D& clusterLocalPosition, Amg::MatrixX& covMatrix) const; + const float theta, Amg::Vector2D& clusterLocalPosition, Amg::MatrixX& covMatrix) const override; private: /// Muon Detector Descriptor diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/UTPCMMClusterBuilderTool.h b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/UTPCMMClusterBuilderTool.h index b7e09d8c19d..40c593b6070 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/UTPCMMClusterBuilderTool.h +++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/UTPCMMClusterBuilderTool.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ #ifndef UTPCMMClusterBuilderTool_h #define UTPCMMClusterBuilderTool_h @@ -46,8 +46,9 @@ namespace Muon StatusCode getClusters(std::vector& MMprds, std::vector>& clustersVec)const override ; + virtual StatusCode getCalibratedClusterPosition(const Muon::MMPrepData* cluster, std::vector&, const float theta , - Amg::Vector2D& clusterLocalPosition, Amg::MatrixX& covMatrix) const; + Amg::Vector2D& clusterLocalPosition, Amg::MatrixX& covMatrix) const override; private: -- GitLab