Skip to content
Snippets Groups Projects
Commit e0a48add authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'clang.MuonCombinedTrackFindingTools-20201215' into 'master'

MuonCombinedTrackFindingTools+MuonTrackFinderTools+MuonTrackSteeringTools: Fix clang warnings

See merge request atlas/athena!39220
parents ba95e963 e3b3c693
No related branches found
No related tags found
No related merge requests found
...@@ -110,15 +110,15 @@ namespace Muon { ...@@ -110,15 +110,15 @@ namespace Muon {
virtual ~MuonSegmentRegionRecoveryTool () = default; virtual ~MuonSegmentRegionRecoveryTool () = default;
/** @brief AlgTool initialize */ /** @brief AlgTool initialize */
StatusCode initialize(); virtual StatusCode initialize() override;
/** @brief AlgTool finalize */ /** @brief AlgTool finalize */
StatusCode finalize(); virtual StatusCode finalize() override;
/** @brief returns a new track with segments recovered using RegionSelector*/ /** @brief returns a new track with segments recovered using RegionSelector*/
Trk::Track* recover( const Trk::Track& track ) const; virtual Trk::Track* recover( const Trk::Track& track ) const override;
void cleanUp() const override; virtual void cleanUp() const override;
private: private:
......
...@@ -68,13 +68,13 @@ namespace Muon { ...@@ -68,13 +68,13 @@ namespace Muon {
MooCandidateMatchingTool(const std::string&, const std::string&, const IInterface*); MooCandidateMatchingTool(const std::string&, const std::string&, const IInterface*);
/** destructor */ /** destructor */
~MooCandidateMatchingTool(); virtual ~MooCandidateMatchingTool();
/** initialize method, method taken from bass-class AlgTool */ /** initialize method, method taken from bass-class AlgTool */
StatusCode initialize(); virtual StatusCode initialize() override;
/** finialize method, method taken from bass-class AlgTool */ /** finialize method, method taken from bass-class AlgTool */
StatusCode finalize(); virtual StatusCode finalize() override;
/** @brief access to tool interface */ /** @brief access to tool interface */
static const InterfaceID& interfaceID() { return IID_MooCandidateMatchingTool; } static const InterfaceID& interfaceID() { return IID_MooCandidateMatchingTool; }
...@@ -89,7 +89,7 @@ namespace Muon { ...@@ -89,7 +89,7 @@ namespace Muon {
bool match( const MuPatCandidateBase& entry1, const MuPatSegment& entry2, bool useTightCuts = false ) const; bool match( const MuPatCandidateBase& entry1, const MuPatSegment& entry2, bool useTightCuts = false ) const;
/** @brief match a track with a segment */ /** @brief match a track with a segment */
bool match( const Trk::Track& track, const MuonSegment& segment, bool useTightCuts ) const; virtual bool match( const Trk::Track& track, const MuonSegment& segment, bool useTightCuts ) const override;
/** @brief calculate the info needed for the matching decision */ /** @brief calculate the info needed for the matching decision */
void calculateTrackSegmentMatchResult( const MuPatTrack& entry1, const MuPatSegment& entry2, MooTrackSegmentMatchResult& info ) const; void calculateTrackSegmentMatchResult( const MuPatTrack& entry1, const MuPatSegment& entry2, MooTrackSegmentMatchResult& info ) const;
......
...@@ -29,13 +29,13 @@ namespace Muon { ...@@ -29,13 +29,13 @@ namespace Muon {
/** Default AlgTool functions */ /** Default AlgTool functions */
MuonLayerAmbiguitySolverTool(const std::string& type, const std::string& name, const IInterface* parent); MuonLayerAmbiguitySolverTool(const std::string& type, const std::string& name, const IInterface* parent);
virtual ~MuonLayerAmbiguitySolverTool()=default; virtual ~MuonLayerAmbiguitySolverTool()=default;
StatusCode initialize(); virtual StatusCode initialize() override;
/**IMuonLayerAmbiguitySolverTool interface: find */ /**IMuonLayerAmbiguitySolverTool interface: find */
void resolveOverlaps( const std::vector<Muon::MuonLayerRecoData>& allLayers, std::vector< MuonCandidate >& resolvedCandidates ) const; virtual void resolveOverlaps( const std::vector<Muon::MuonLayerRecoData>& allLayers, std::vector< MuonCandidate >& resolvedCandidates ) const override;
void cleanUp() const override; virtual void cleanUp() const override;
private: private:
void buildLayerVec( const std::vector<MuonLayerRecoData>& allLayers, void buildLayerVec( const std::vector<MuonLayerRecoData>& allLayers,
......
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