Skip to content
Snippets Groups Projects
Commit c6da69b3 authored by scott snyder's avatar scott snyder
Browse files

MuidTrackBuilder: Fix clang warnings.

Missing override keywords.
parent 6f6a97cd
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!39180MuidTrackBuilder+MuonCombinedBaseTools: Fix clang warnings
...@@ -62,37 +62,42 @@ namespace Rec { ...@@ -62,37 +62,42 @@ namespace Rec {
class CombinedMuonTrackBuilder : public AthAlgTool, virtual public ICombinedMuonTrackBuilder { class CombinedMuonTrackBuilder : public AthAlgTool, virtual public ICombinedMuonTrackBuilder {
public: public:
CombinedMuonTrackBuilder(const std::string& type, const std::string& name, const IInterface* parent); CombinedMuonTrackBuilder(const std::string& type, const std::string& name, const IInterface* parent);
~CombinedMuonTrackBuilder(); virtual ~CombinedMuonTrackBuilder();
StatusCode initialize(); virtual StatusCode initialize() override;
StatusCode finalize(); virtual StatusCode finalize() override;
/** ICombinedMuonTrackBuilder interface: build and fit combined ID/Calo/MS track */ /** ICombinedMuonTrackBuilder interface: build and fit combined ID/Calo/MS track */
virtual
Trk::Track* combinedFit(const Trk::Track& indetTrack, const Trk::Track& extrapolatedTrack, Trk::Track* combinedFit(const Trk::Track& indetTrack, const Trk::Track& extrapolatedTrack,
const Trk::Track& spectrometerTrack) const; const Trk::Track& spectrometerTrack) const override;
/** ICombinedMuonTrackBuilder interface: /** ICombinedMuonTrackBuilder interface:
build and fit indet track extended to include MS Measurement set. build and fit indet track extended to include MS Measurement set.
Adds material effects as appropriate plus calo energy-loss treatment */ Adds material effects as appropriate plus calo energy-loss treatment */
virtual
Trk::Track* indetExtension(const Trk::Track& indetTrack, const Trk::MeasurementSet& spectrometerMeas, Trk::Track* indetExtension(const Trk::Track& indetTrack, const Trk::MeasurementSet& spectrometerMeas,
const Trk::TrackParameters* innerParameters, const Trk::TrackParameters* innerParameters,
const Trk::TrackParameters* middleParameters, const Trk::TrackParameters* middleParameters,
const Trk::TrackParameters* outerParameters) const; const Trk::TrackParameters* outerParameters) const override;
/** ICombinedMuonTrackBuilder interface: /** ICombinedMuonTrackBuilder interface:
propagate to perigee adding calo energy-loss and material to MS track */ 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, 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: /** ICombinedMuonTrackBuilder interface:
refit a track removing any indet measurements with optional addition of pseudoMeasurements */ 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; using ICombinedMuonTrackBuilder::fit;
/*refit a track */ /*refit a track */
virtual
Trk::Track* fit(Trk::Track& track, const Trk::RunOutlierRemoval runOutlier = false, 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 */ fit a set of MeasurementBase objects with starting value for perigeeParameters */
......
...@@ -42,36 +42,41 @@ namespace Rec { ...@@ -42,36 +42,41 @@ namespace Rec {
class OutwardsCombinedMuonTrackBuilder : public AthAlgTool, virtual public ICombinedMuonTrackBuilder { class OutwardsCombinedMuonTrackBuilder : public AthAlgTool, virtual public ICombinedMuonTrackBuilder {
public: public:
OutwardsCombinedMuonTrackBuilder(const std::string& type, const std::string& name, const IInterface* parent); 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 */ /** ICombinedMuonTrackBuilder interface: build and fit combined ID/Calo/MS track */
virtual
Trk::Track* combinedFit(const Trk::Track& indetTrack, const Trk::Track& extrapolatedTrack, Trk::Track* combinedFit(const Trk::Track& indetTrack, const Trk::Track& extrapolatedTrack,
const Trk::Track& spectrometerTrack) const; const Trk::Track& spectrometerTrack) const override;
/** ICombinedMuonTrackBuilder interface: /** ICombinedMuonTrackBuilder interface:
build and fit indet track extended to include MS Measurement set. build and fit indet track extended to include MS Measurement set.
Adds material effects as appropriate plus calo energy-loss treatment */ Adds material effects as appropriate plus calo energy-loss treatment */
virtual
Trk::Track* indetExtension(const Trk::Track& indetTrack, const Trk::MeasurementSet& spectrometerMeas, Trk::Track* indetExtension(const Trk::Track& indetTrack, const Trk::MeasurementSet& spectrometerMeas,
const Trk::TrackParameters* innerParameters, const Trk::TrackParameters* innerParameters,
const Trk::TrackParameters* middleParameters, const Trk::TrackParameters* middleParameters,
const Trk::TrackParameters* outerParameters) const; const Trk::TrackParameters* outerParameters) const override;
/** ICombinedMuonTrackBuilder interface: /** ICombinedMuonTrackBuilder interface:
propagate to perigee adding calo energy-loss and material to MS track */ 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, 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: /** ICombinedMuonTrackBuilder interface:
refit a track removing any indet measurements with optional addition of pseudoMeasurements refit a track removing any indet measurements with optional addition of pseudoMeasurements
according to original extrapolation */ 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; using ICombinedMuonTrackBuilder::fit;
/** refit a track */ /** refit a track */
virtual
Trk::Track* fit(Trk::Track& track, const Trk::RunOutlierRemoval runOutlier = false, 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 ...@@ -104,7 +109,7 @@ class OutwardsCombinedMuonTrackBuilder : public AthAlgTool, virtual public IComb
const Trk::RunOutlierRemoval runOutlier = false, const Trk::RunOutlierRemoval runOutlier = false,
const Trk::ParticleHypothesis particleHypothesis = Trk::muon) const; const Trk::ParticleHypothesis particleHypothesis = Trk::muon) const;
void cleanUp() const override; virtual void cleanUp() const override;
private: private:
Trk::Track* addIDMSerrors(Trk::Track* track) const; Trk::Track* addIDMSerrors(Trk::Track* track) const;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment