From c6da69b323989832e1b1ebf56a4c93ded3211b1f Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Mon, 14 Dec 2020 15:39:29 +0100
Subject: [PATCH] MuidTrackBuilder: Fix clang warnings.
Missing override keywords.
---
.../CombinedMuonTrackBuilder.h | 21 ++++++++++++-------
.../OutwardsCombinedMuonTrackBuilder.h | 21 ++++++++++++-------
2 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/Reconstruction/MuonIdentification/MuidTrackBuilder/MuidTrackBuilder/CombinedMuonTrackBuilder.h b/Reconstruction/MuonIdentification/MuidTrackBuilder/MuidTrackBuilder/CombinedMuonTrackBuilder.h
index 81dd5e2324b..3255fef13fa 100755
--- a/Reconstruction/MuonIdentification/MuidTrackBuilder/MuidTrackBuilder/CombinedMuonTrackBuilder.h
+++ b/Reconstruction/MuonIdentification/MuidTrackBuilder/MuidTrackBuilder/CombinedMuonTrackBuilder.h
@@ -62,37 +62,42 @@ namespace Rec {
class CombinedMuonTrackBuilder : public AthAlgTool, virtual public ICombinedMuonTrackBuilder {
public:
CombinedMuonTrackBuilder(const std::string& type, const std::string& name, const IInterface* parent);
- ~CombinedMuonTrackBuilder();
+ virtual ~CombinedMuonTrackBuilder();
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
/** ICombinedMuonTrackBuilder interface: build and fit combined ID/Calo/MS track */
+ virtual
Trk::Track* combinedFit(const Trk::Track& indetTrack, const Trk::Track& extrapolatedTrack,
- const Trk::Track& spectrometerTrack) const;
+ const Trk::Track& spectrometerTrack) const override;
/** ICombinedMuonTrackBuilder interface:
build and fit indet track extended to include MS Measurement set.
Adds material effects as appropriate plus calo energy-loss treatment */
+ virtual
Trk::Track* indetExtension(const Trk::Track& indetTrack, const Trk::MeasurementSet& spectrometerMeas,
const Trk::TrackParameters* innerParameters,
const Trk::TrackParameters* middleParameters,
- const Trk::TrackParameters* outerParameters) const;
+ const Trk::TrackParameters* outerParameters) const override;
/** ICombinedMuonTrackBuilder interface:
propagate to perigee adding calo energy-loss and material to MS track */
+ virtual
Trk::Track* standaloneFit(const Trk::Track& spectrometerTrack, const Trk::Vertex* vertex, float bs_x, float bs_y,
- float bs_z) const;
+ float bs_z) const override;
/** ICombinedMuonTrackBuilder interface:
refit a track removing any indet measurements with optional addition of pseudoMeasurements */
- Trk::Track* standaloneRefit(const Trk::Track& combinedTrack, float bs_x, float bs_y, float bs_z) const;
+ virtual
+ Trk::Track* standaloneRefit(const Trk::Track& combinedTrack, float bs_x, float bs_y, float bs_z) const override;
using ICombinedMuonTrackBuilder::fit;
/*refit a track */
+ virtual
Trk::Track* fit(Trk::Track& track, const Trk::RunOutlierRemoval runOutlier = false,
- const Trk::ParticleHypothesis particleHypothesis = Trk::muon) const;
+ const Trk::ParticleHypothesis particleHypothesis = Trk::muon) const override;
/**
fit a set of MeasurementBase objects with starting value for perigeeParameters */
diff --git a/Reconstruction/MuonIdentification/MuidTrackBuilder/MuidTrackBuilder/OutwardsCombinedMuonTrackBuilder.h b/Reconstruction/MuonIdentification/MuidTrackBuilder/MuidTrackBuilder/OutwardsCombinedMuonTrackBuilder.h
index 6dca3a9b27c..9596475e391 100644
--- a/Reconstruction/MuonIdentification/MuidTrackBuilder/MuidTrackBuilder/OutwardsCombinedMuonTrackBuilder.h
+++ b/Reconstruction/MuonIdentification/MuidTrackBuilder/MuidTrackBuilder/OutwardsCombinedMuonTrackBuilder.h
@@ -42,36 +42,41 @@ namespace Rec {
class OutwardsCombinedMuonTrackBuilder : public AthAlgTool, virtual public ICombinedMuonTrackBuilder {
public:
OutwardsCombinedMuonTrackBuilder(const std::string& type, const std::string& name, const IInterface* parent);
- ~OutwardsCombinedMuonTrackBuilder()=default;
+ virtual ~OutwardsCombinedMuonTrackBuilder()=default;
- StatusCode initialize();
+ virtual StatusCode initialize() override;
/** ICombinedMuonTrackBuilder interface: build and fit combined ID/Calo/MS track */
+ virtual
Trk::Track* combinedFit(const Trk::Track& indetTrack, const Trk::Track& extrapolatedTrack,
- const Trk::Track& spectrometerTrack) const;
+ const Trk::Track& spectrometerTrack) const override;
/** ICombinedMuonTrackBuilder interface:
build and fit indet track extended to include MS Measurement set.
Adds material effects as appropriate plus calo energy-loss treatment */
+ virtual
Trk::Track* indetExtension(const Trk::Track& indetTrack, const Trk::MeasurementSet& spectrometerMeas,
const Trk::TrackParameters* innerParameters,
const Trk::TrackParameters* middleParameters,
- const Trk::TrackParameters* outerParameters) const;
+ const Trk::TrackParameters* outerParameters) const override;
/** ICombinedMuonTrackBuilder interface:
propagate to perigee adding calo energy-loss and material to MS track */
+ virtual
Trk::Track* standaloneFit(const Trk::Track& spectrometerTrack, const Trk::Vertex* vertex, float bs_x, float bs_y,
- float bs_z) const;
+ float bs_z) const override;
/** ICombinedMuonTrackBuilder interface:
refit a track removing any indet measurements with optional addition of pseudoMeasurements
according to original extrapolation */
- Trk::Track* standaloneRefit(const Trk::Track& combinedTrack, float bs_x, float bs_y, float bs_z) const;
+ virtual
+ Trk::Track* standaloneRefit(const Trk::Track& combinedTrack, float bs_x, float bs_y, float bs_z) const override;
using ICombinedMuonTrackBuilder::fit;
/** refit a track */
+ virtual
Trk::Track* fit(Trk::Track& track, const Trk::RunOutlierRemoval runOutlier = false,
- const Trk::ParticleHypothesis particleHypothesis = Trk::muon) const;
+ const Trk::ParticleHypothesis particleHypothesis = Trk::muon) const override;
/**
@@ -104,7 +109,7 @@ class OutwardsCombinedMuonTrackBuilder : public AthAlgTool, virtual public IComb
const Trk::RunOutlierRemoval runOutlier = false,
const Trk::ParticleHypothesis particleHypothesis = Trk::muon) const;
- void cleanUp() const override;
+ virtual void cleanUp() const override;
private:
Trk::Track* addIDMSerrors(Trk::Track* track) const;
--
GitLab