From db36f13d3abc58802173b20f36873a923aae8b39 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Mon, 14 Dec 2020 15:34:13 +0100
Subject: [PATCH 1/2] InDetTrackSelectorTool: Fix clang warings.
Missing override keywords.
---
.../InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h | 6 +++---
.../InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h | 6 +++---
.../InDetTrackSelectorTool/InDetTrackSelectorTool.h | 6 +++---
.../InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h
index 007d78cf7437..c9f682775b31 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h
@@ -38,11 +38,11 @@ namespace InDet
~InDetCosmicTrackSelectorTool();
- bool decision(const Trk::Track& track,const Trk::Vertex* vertex) const;
+ virtual bool decision(const Trk::Track& track,const Trk::Vertex* vertex) const override;
- bool decision(const Trk::TrackParticleBase& track,const Trk::Vertex* vertex) const;
+ virtual bool decision(const Trk::TrackParticleBase& track,const Trk::Vertex* vertex) const override;
- bool decision(const xAOD::TrackParticle&,const xAOD::Vertex*) const {
+ virtual bool decision(const xAOD::TrackParticle&,const xAOD::Vertex*) const override {
ATH_MSG_WARNING("xAOD::TrackParticle selection not implemented yet");
return false;
}
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h
index b121018457f5..0a32e5de9211 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h
@@ -42,13 +42,13 @@ namespace InDet
~InDetIsoTrackSelectorTool();
/** ESD type interface */
- bool decision(const Trk::AtaStraightLine&, const Trk::Track& track) const;
+ virtual bool decision(const Trk::AtaStraightLine&, const Trk::Track& track) const override;
/** AOD type interface */
- bool decision(const Trk::AtaStraightLine&, const Trk::TrackParticleBase& trackParticle) const;
+ virtual bool decision(const Trk::AtaStraightLine&, const Trk::TrackParticleBase& trackParticle) const override;
/** Work-horse interface - will ignore TrackSelector */
- bool decision(const Trk::AtaStraightLine&, const Trk::TrackParameters& trackPars) const;
+ virtual bool decision(const Trk::AtaStraightLine&, const Trk::TrackParameters& trackPars) const override;
private:
/** Robust cut window setting */
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h
index 386090734df0..c3633ad3c5a8 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h
@@ -50,11 +50,11 @@ namespace InDet
~InDetTrackSelectorTool();
- bool decision(const Trk::Track& track,const Trk::Vertex* vertex) const;
+ virtual bool decision(const Trk::Track& track,const Trk::Vertex* vertex) const override;
- bool decision(const Trk::TrackParticleBase& track,const Trk::Vertex* vertex) const;
+ virtual bool decision(const Trk::TrackParticleBase& track,const Trk::Vertex* vertex) const override;
- bool decision(const xAOD::TrackParticle&,const xAOD::Vertex*) const {
+ virtual bool decision(const xAOD::TrackParticle&,const xAOD::Vertex*) const override {
ATH_MSG_WARNING("xAOD::TrackParticle selection not implemented yet");
return false;
}
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h
index e399c8e5fc54..406b0f29cdcc 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h
@@ -30,10 +30,10 @@ namespace InDet{
InDetTrtDriftCircleCutTool(const std::string& t, const std::string& n, const IInterface* p);
- ~InDetTrtDriftCircleCutTool();
+ virtual ~InDetTrtDriftCircleCutTool();
/** @brief Minimum number of drift circles using the track scoring tool */
- int minNumberDCs(const Trk::TrackParameters*) const;
+ virtual int minNumberDCs(const Trk::TrackParameters*) const override;
private:
--
GitLab
From aa8cda3588def2d86301356b5ceb83a922637055 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Mon, 14 Dec 2020 15:32:56 +0100
Subject: [PATCH 2/2] InDetSecVxFinderTool: Fix clang warnings.
Missing override keywords.
---
.../InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h | 2 +-
.../InDetSecVxFinderTool/InDetJetFitterVxFinder.h | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h
index ed687a57f512..6025446d5865 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h
@@ -74,7 +74,7 @@ namespace InDet {
virtual Trk::VxSecVertexInfo* findSecVertex(const xAOD::Vertex & primaryVertex,
const TLorentzVector & jetMomentum,
- const std::vector<const xAOD::IParticle*> & inputTracks) const;
+ const std::vector<const xAOD::IParticle*> & inputTracks) const override;
private:
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h
index 13cd285d3563..747166aa128c 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h
@@ -62,9 +62,10 @@ namespace InDet {
~InDetJetFitterVxFinder();
+ virtual
Trk::VxSecVertexInfo* findSecVertex(const xAOD::Vertex & /*primaryVertex*/,
const TLorentzVector & /*jetMomentum*/,
- const std::vector<const xAOD::IParticle*> & /*inputTracks*/ ) const
+ const std::vector<const xAOD::IParticle*> & /*inputTracks*/ ) const override
{
/* not implemented */
return 0;
--
GitLab