From d4c736bef199553d45a4804737c6669559c8cc07 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Mon, 7 Dec 2020 16:39:27 +0100
Subject: [PATCH 1/3] TrkVertexFitterUtils: Fix clang warnings.
Missing override keywords.
---
.../FullLinearizedTrackFactory.h | 8 +++--
.../KalmanVertexTrackUpdator.h | 2 +-
.../KalmanVertexUpdator.h | 14 ++++----
.../TrackToVertexIPEstimator.h | 34 +++++++++++--------
.../src/NeutralParticleParameterCalculator.h | 2 +-
5 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/FullLinearizedTrackFactory.h b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/FullLinearizedTrackFactory.h
index b86c5ae87289..f6901964d1cc 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/FullLinearizedTrackFactory.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/FullLinearizedTrackFactory.h
@@ -77,23 +77,25 @@ namespace Trk
* Produces a new PerigeeLinearizedState and stores its pointer as a private
* member of VxTrackAtVertex
*/
- void linearize(VxTrackAtVertex & theTrack,const Amg::Vector3D & linPoint) const;
+ virtual void linearize(VxTrackAtVertex & theTrack,const Amg::Vector3D & linPoint) const override;
/**
* Linearization method:
* Takes a MeasuredPerigee and a LinearizationPoint.
* Creates a new PerigeeLinearizedTrackState and returns its pointer.
*/
+ virtual
LinearizedTrack * linearizedTrack(const TrackParameters *param,
- const Amg::Vector3D & linPoint) const;
+ const Amg::Vector3D & linPoint) const override;
/**
* Linearization method:
* Takes a MeasuredPerigee and a LinearizationPoint.
* Creates a new PerigeeLinearizedTrackState and returns its pointer.
*/
+ virtual
LinearizedTrack * linearizedTrack(const NeutralParameters *param,
- const Amg::Vector3D & linPoint) const;
+ const Amg::Vector3D & linPoint) const override;
private:
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexTrackUpdator.h b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexTrackUpdator.h
index fe6369ccc351..f0e86b3253b2 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexTrackUpdator.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexTrackUpdator.h
@@ -56,7 +56,7 @@ namespace Trk
/**
* Update method
*/
- void update(VxTrackAtVertex& trk, const xAOD::Vertex& vtx) const;
+ virtual void update(VxTrackAtVertex& trk, const xAOD::Vertex& vtx) const override;
private:
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexUpdator.h b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexUpdator.h
index 5e129192a152..bbf9e0ba77fd 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexUpdator.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexUpdator.h
@@ -51,29 +51,29 @@ namespace Trk
/**
* Method adding a single track to the vertex estimate
*/
- xAOD::Vertex * add(xAOD::Vertex& vtx, VxTrackAtVertex& trk) const;
+ virtual xAOD::Vertex * add(xAOD::Vertex& vtx, VxTrackAtVertex& trk) const override;
/**
* Method removing already added track from the vertex estimate
*/
- xAOD::Vertex * remove(xAOD::Vertex& vtx, VxTrackAtVertex& trk) const;
+ virtual xAOD::Vertex * remove(xAOD::Vertex& vtx, VxTrackAtVertex& trk) const override;
/**
* Position update method. The 'mode' parameter is used to indicate whether we want to add or remove a track.
*/
- IVertexUpdator::positionUpdateOutcome positionUpdate (const xAOD::Vertex& vtx, const LinearizedTrack * trk, double trackWeight, IVertexUpdator::updateMode mode) const;
+ virtual IVertexUpdator::positionUpdateOutcome positionUpdate (const xAOD::Vertex& vtx, const LinearizedTrack * trk, double trackWeight, IVertexUpdator::updateMode mode) const override;
/**
* Method calculating the interstep Chi2 increment
*/
- float trackParametersChi2(const xAOD::Vertex& new_vtx, const LinearizedTrack * trk) const;
- float trackParametersChi2(const IVertexUpdator::positionUpdateOutcome& new_vtx, const LinearizedTrack * trk) const;
+ virtual float trackParametersChi2(const xAOD::Vertex& new_vtx, const LinearizedTrack * trk) const override;
+ virtual float trackParametersChi2(const IVertexUpdator::positionUpdateOutcome& new_vtx, const LinearizedTrack * trk) const override;
/**
* Method calculating the vertex displacement-related part of the chi2
*/
- float vertexPositionChi2(const xAOD::Vertex& old_vtx, const xAOD::Vertex& new_vtx) const;
- float vertexPositionChi2(const xAOD::Vertex& old_vtx, const IVertexUpdator::positionUpdateOutcome& new_vtx) const;
+ virtual float vertexPositionChi2(const xAOD::Vertex& old_vtx, const xAOD::Vertex& new_vtx) const override;
+ virtual float vertexPositionChi2(const xAOD::Vertex& old_vtx, const IVertexUpdator::positionUpdateOutcome& new_vtx) const override;
private:
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/TrackToVertexIPEstimator.h b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/TrackToVertexIPEstimator.h
index 7354c548e76e..d649f5a748b9 100644
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/TrackToVertexIPEstimator.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/TrackToVertexIPEstimator.h
@@ -92,41 +92,47 @@ namespace Trk
* Estimate methods returning a d0 and its calculated sigma.
* All methods do check whether a track is actually fitted to a vertex
*/
- const ImpactParametersAndSigma * estimate(const xAOD::TrackParticle * track, const xAOD::Vertex * vtx, bool doRemoval) const;
- const ImpactParametersAndSigma * estimate(const TrackParameters * track, const xAOD::Vertex * vtx, bool doRemoval) const;
+ virtual const ImpactParametersAndSigma * estimate(const xAOD::TrackParticle * track, const xAOD::Vertex * vtx, bool doRemoval) const override;
+ virtual const ImpactParametersAndSigma * estimate(const TrackParameters * track, const xAOD::Vertex * vtx, bool doRemoval) const override;
- const ImpactParametersAndSigma * estimate(const xAOD::TrackParticle * track,const xAOD::TrackParticle * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const;
- const ImpactParametersAndSigma * estimate(const TrackParameters * track, const TrackParameters * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const;
+ virtual const ImpactParametersAndSigma * estimate(const xAOD::TrackParticle * track,const xAOD::TrackParticle * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const override;
+ virtual const ImpactParametersAndSigma * estimate(const TrackParameters * track, const TrackParameters * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const override;
- virtual const xAOD::Vertex * getUnbiasedVertex(const xAOD::TrackParticle * track, const xAOD::Vertex * vtx ) const ;
- virtual const xAOD::Vertex * getUnbiasedVertex(const TrackParameters * track, const xAOD::Vertex * vtx ) const ;
+ virtual const xAOD::Vertex * getUnbiasedVertex(const xAOD::TrackParticle * track, const xAOD::Vertex * vtx ) const override;
+ virtual const xAOD::Vertex * getUnbiasedVertex(const TrackParameters * track, const xAOD::Vertex * vtx ) const override;
- virtual const ImpactParametersAndSigma * estimate(const xAOD::TrackParticle * track, const xAOD::Vertex* vtx)const;
- virtual const ImpactParametersAndSigma * estimate(const TrackParameters * track, const xAOD::Vertex* vtx)const;
+ virtual const ImpactParametersAndSigma * estimate(const xAOD::TrackParticle * track, const xAOD::Vertex* vtx)const override;
+ virtual const ImpactParametersAndSigma * estimate(const TrackParameters * track, const xAOD::Vertex* vtx)const override;
/* Methods which provide the lifetime Sign for the Impact Parameter (2D, Z, 3D) */
+ virtual
double get3DLifetimeSignOfTrack(const TrackParameters & track,
const Amg::Vector3D & jetDirection,
- const xAOD::Vertex & primaryVertex) const;
+ const xAOD::Vertex & primaryVertex) const override;
+ virtual
double get3DLifetimeSignOfTrack(const TrackParameters & track,
const CLHEP::Hep3Vector & jetDirection,
- const xAOD::Vertex & primaryVertex) const;
+ const xAOD::Vertex & primaryVertex) const override;
+ virtual
double get2DLifetimeSignOfTrack(const TrackParameters & track,
const Amg::Vector3D & jetDirection,
- const xAOD::Vertex & primaryVertex) const;
+ const xAOD::Vertex & primaryVertex) const override;
+ virtual
double get2DLifetimeSignOfTrack(const TrackParameters & track,
const CLHEP::Hep3Vector & jetDirection,
- const xAOD::Vertex & primaryVertex) const;
+ const xAOD::Vertex & primaryVertex) const override;
+ virtual
double getZLifetimeSignOfTrack(const TrackParameters & track,
const Amg::Vector3D & jetDirection,
- const xAOD::Vertex & primaryVertex) const;
+ const xAOD::Vertex & primaryVertex) const override;
+ virtual
double getZLifetimeSignOfTrack(const TrackParameters & track,
const CLHEP::Hep3Vector & jetDirection,
- const xAOD::Vertex & primaryVertex) const;
+ const xAOD::Vertex & primaryVertex) const override;
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.h b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.h
index f483e52c6374..aa2e7c30e73b 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.h
@@ -58,7 +58,7 @@ namespace Trk
/**
* method that makes the parameters of a V0 or photon before decay to two tracks
*/
- NeutralPerigee* createNeutralTrackFromVertex(const xAOD::Vertex& ) const;
+ virtual NeutralPerigee* createNeutralTrackFromVertex(const xAOD::Vertex& ) const override;
private:
--
GitLab
From c3ba0c943f55996a011ef199660633d35212c690 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Mon, 7 Dec 2020 16:38:34 +0100
Subject: [PATCH 2/3] MuonCablingServers: Fix clang warnings.
Missing override keywords.
---
.../MuonCablingServers/RPCcablingServerSvc.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/RPCcablingServerSvc.h b/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/RPCcablingServerSvc.h
index 0b5e765dfa1e..ec9d0ac2b929 100644
--- a/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/RPCcablingServerSvc.h
+++ b/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/RPCcablingServerSvc.h
@@ -32,13 +32,13 @@ class RPCcablingServerSvc : public AthService,
RPCcablingServerSvc(const std::string& name, ISvcLocator* svc);
virtual ~RPCcablingServerSvc() {}
- virtual StatusCode queryInterface(const InterfaceID& riid,void** ppvIF);
- virtual StatusCode initialize(void);
- virtual StatusCode finalize(void);
+ virtual StatusCode queryInterface(const InterfaceID& riid,void** ppvIF) override;
+ virtual StatusCode initialize(void) override;
+ virtual StatusCode finalize(void) override;
// Interface implementation
- virtual StatusCode giveCabling(const IRPCcablingSvc*&) const;
- virtual bool isAtlas(void) const;
+ virtual StatusCode giveCabling(const IRPCcablingSvc*&) const override;
+ virtual bool isAtlas(void) const override;
// ITagInfoMgr callback
virtual void tagInfoUpdated() override final { compareTags().ignore(); }
--
GitLab
From 1abfa093d17cd783bf4df235f54acd9f1526a56a Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Mon, 7 Dec 2020 16:40:25 +0100
Subject: [PATCH 3/3] TileTrackingGeometry: Fix clang warnings.
Unused private data member.
---
.../TileTrackingGeometry/TileVolumeBuilder.h | 3 +--
TileCalorimeter/TileTrackingGeometry/src/TileVolumeBuilder.cxx | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/TileCalorimeter/TileTrackingGeometry/TileTrackingGeometry/TileVolumeBuilder.h b/TileCalorimeter/TileTrackingGeometry/TileTrackingGeometry/TileVolumeBuilder.h
index 1bee74e53726..863678fc4fda 100755
--- a/TileCalorimeter/TileTrackingGeometry/TileTrackingGeometry/TileVolumeBuilder.h
+++ b/TileCalorimeter/TileTrackingGeometry/TileTrackingGeometry/TileVolumeBuilder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -72,7 +72,6 @@ namespace Tile {
const TileDetDescrManager* m_tileMgr; //!< Calo DetDescrMgr
std::string m_tileMgrLocation; //!< Location of the CaloDetDescrMgr
- const CaloDetDescrManager* m_calo_dd;
ToolHandle<Trk::ITrackingVolumeHelper> m_trackingVolumeHelper; //!< Helper Tool to create TrackingVolumes
ToolHandle<Trk::ITrackingVolumeCreator> m_trackingVolumeCreator; //!< Second helper for volume creation
diff --git a/TileCalorimeter/TileTrackingGeometry/src/TileVolumeBuilder.cxx b/TileCalorimeter/TileTrackingGeometry/src/TileVolumeBuilder.cxx
index ac5c69f10178..6c571e9e7004 100755
--- a/TileCalorimeter/TileTrackingGeometry/src/TileVolumeBuilder.cxx
+++ b/TileCalorimeter/TileTrackingGeometry/src/TileVolumeBuilder.cxx
@@ -62,7 +62,6 @@ Tile::TileVolumeBuilder::TileVolumeBuilder(const std::string& t, const std::stri
AthAlgTool(t,n,p),
m_tileMgr(0),
m_tileMgrLocation("Tile"),
- m_calo_dd(0),
m_trackingVolumeHelper("Trk::TrackingVolumeHelper/TrackingVolumeHelper"),
m_trackingVolumeCreator("Trk::CylinderVolumeCreator/TrackingVolumeCreator"),
m_tileBarrelEnvelope(25.*mm),
--
GitLab