From eaf3cf3f458b49c99a3f2c6019f95bd5167f13bc Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Tue, 20 Dec 2016 03:38:55 +0100
Subject: [PATCH] 'Changing constness of some interfaces, to deal with tool
handle constness changes.' (MuonCombinedTrackFindingTools-00-01-06)
* Tagging MuonCombinedTrackFindingTools-00-01-06.
* Changing constness of some interfaces, to deal with tool handle
constness changes.
Former-commit-id: 8d9649ee73c5c27badf361cad9281751252b21bf
---
.../src/MuonInsideOutRecoTool.cxx | 6 ++--
.../src/MuonInsideOutRecoTool.h | 10 +++----
.../src/MuonStauRecoTool.cxx | 24 ++++++++--------
.../src/MuonStauRecoTool.h | 28 +++++++++----------
4 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonInsideOutRecoTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonInsideOutRecoTool.cxx
index 3946da11f3e..680ba3b27d7 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonInsideOutRecoTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonInsideOutRecoTool.cxx
@@ -76,7 +76,7 @@ namespace MuonCombined {
return StatusCode::SUCCESS;
}
- void MuonInsideOutRecoTool::extend( const InDetCandidateCollection& inDetCandidates ) const {
+ void MuonInsideOutRecoTool::extend( const InDetCandidateCollection& inDetCandidates ) {
ATH_MSG_DEBUG(" extending " << inDetCandidates.size() );
InDetCandidateCollection::const_iterator it = inDetCandidates.begin();
@@ -86,7 +86,7 @@ namespace MuonCombined {
}
}
- void MuonInsideOutRecoTool::handleCandidate( const InDetCandidate& indetCandidate ) const {
+ void MuonInsideOutRecoTool::handleCandidate( const InDetCandidate& indetCandidate ) {
const xAOD::TrackParticle& indetTrackParticle = indetCandidate.indetTrackParticle();
if( !indetTrackParticle.track() || indetTrackParticle.pt() < m_idTrackMinPt ) return;
@@ -160,7 +160,7 @@ namespace MuonCombined {
std::pair<std::unique_ptr<const Muon::MuonCandidate>,std::unique_ptr<const Trk::Track> >
- MuonInsideOutRecoTool::findBestCandidate( const xAOD::TrackParticle& indetTrackParticle, const std::vector< Muon::MuonLayerRecoData >& allLayers) const {
+ MuonInsideOutRecoTool::findBestCandidate( const xAOD::TrackParticle& indetTrackParticle, const std::vector< Muon::MuonLayerRecoData >& allLayers) {
// resolve ambiguities
std::vector< Muon::MuonCandidate > resolvedCandidates;
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonInsideOutRecoTool.h b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonInsideOutRecoTool.h
index 91777c50ed3..53eb9aa134d 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonInsideOutRecoTool.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonInsideOutRecoTool.h
@@ -46,22 +46,22 @@ namespace MuonCombined {
/** Default AlgTool functions */
MuonInsideOutRecoTool(const std::string& type, const std::string& name, const IInterface* parent);
virtual ~MuonInsideOutRecoTool();
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
/** @brief access to tool interface */
static const InterfaceID& interfaceID() { return IID_MuonInsideOutRecoTool; }
/**IMuonCombinedInDetExtensionTool interface: extend ID candidate */
- void extend( const InDetCandidateCollection& inDetCandidates ) const;
+ virtual void extend( const InDetCandidateCollection& inDetCandidates ) override;
/** find the best candidate for a given set of segments */
std::pair<std::unique_ptr<const Muon::MuonCandidate>,std::unique_ptr<const Trk::Track> >
- findBestCandidate( const xAOD::TrackParticle& indetTrackParticle, const std::vector< Muon::MuonLayerRecoData >& allLayers) const;
+ findBestCandidate( const xAOD::TrackParticle& indetTrackParticle, const std::vector< Muon::MuonLayerRecoData >& allLayers);
private:
/** handle a single candidate */
- void handleCandidate( const InDetCandidate& inDetCandidate ) const;
+ void handleCandidate( const InDetCandidate& inDetCandidate );
/** add muon candidate to indet candidate */
void addTag( const InDetCandidate& indetCandidate, const Muon::MuonCandidate& candidate,
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx
index 8ef1abee02f..8d4cd912d58 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx
@@ -156,7 +156,7 @@ namespace MuonCombined {
return StatusCode::SUCCESS;
}
- void MuonStauRecoTool::extend( const InDetCandidateCollection& inDetCandidates ) const {
+ void MuonStauRecoTool::extend( const InDetCandidateCollection& inDetCandidates ) {
ATH_MSG_DEBUG(" extending " << inDetCandidates.size() );
InDetCandidateCollection::const_iterator it = inDetCandidates.begin();
@@ -179,7 +179,7 @@ namespace MuonCombined {
}
- void MuonStauRecoTool::handleCandidate( const InDetCandidate& indetCandidate ) const {
+ void MuonStauRecoTool::handleCandidate( const InDetCandidate& indetCandidate ) {
/** STAGE 0
Preselection, preparation of truth related quantities, extrapolation in muon system
@@ -295,7 +295,7 @@ namespace MuonCombined {
}
bool MuonStauRecoTool::processMuonSystemExtension( const xAOD::TrackParticle& indetTrackParticle, const Muon::MuonSystemExtension& muonSystemExtension,
- MuonStauRecoTool::CandidateVec& candidates ) const {
+ MuonStauRecoTool::CandidateVec& candidates ) {
// loop over intersections, get associated data
AssociatedData associatedData;
@@ -311,7 +311,7 @@ namespace MuonCombined {
return refineCandidates(candidates);
}
- bool MuonStauRecoTool::refineCandidates( MuonStauRecoTool::CandidateVec& candidates ) const {
+ bool MuonStauRecoTool::refineCandidates( MuonStauRecoTool::CandidateVec& candidates ) {
// keep track of candidates for which segments are found
CandidateVec refinedCandidates;
@@ -385,7 +385,7 @@ namespace MuonCombined {
return !candidates.empty();
}
- void MuonStauRecoTool::extractTimeMeasurementsFromTrack( MuonStauRecoTool::Candidate& candidate ) const {
+ void MuonStauRecoTool::extractTimeMeasurementsFromTrack( MuonStauRecoTool::Candidate& candidate ) {
const Trk::Track* combinedTrack = candidate.combinedTrack.get();
if( !combinedTrack ) return;
@@ -851,7 +851,7 @@ namespace MuonCombined {
}
- bool MuonStauRecoTool::resolveAmbiguities( MuonStauRecoTool::CandidateVec& candidates ) const {
+ bool MuonStauRecoTool::resolveAmbiguities( MuonStauRecoTool::CandidateVec& candidates ) {
ATH_MSG_DEBUG("Resolving ambiguities: candidates " << candidates.size());
@@ -900,7 +900,7 @@ namespace MuonCombined {
- bool MuonStauRecoTool::combineCandidates( const xAOD::TrackParticle& indetTrackParticle, MuonStauRecoTool::CandidateVec& candidates ) const {
+ bool MuonStauRecoTool::combineCandidates( const xAOD::TrackParticle& indetTrackParticle, MuonStauRecoTool::CandidateVec& candidates ) {
// keep track of candidates that have a successfull fit
CandidateVec combinedCandidates;
@@ -1099,7 +1099,7 @@ namespace MuonCombined {
}
bool MuonStauRecoTool::extractTimeMeasurements( const Muon::MuonSystemExtension& muonSystemExtension,
- MuonStauRecoTool::AssociatedData& associatedData ) const {
+ MuonStauRecoTool::AssociatedData& associatedData ) {
// get layer intersections
const std::vector<Muon::MuonSystemExtension::Intersection>& layerIntersections = muonSystemExtension.layerIntersections();
@@ -1318,7 +1318,7 @@ namespace MuonCombined {
}
- void MuonStauRecoTool::extractRpcTimingFromMaximum( const Muon::MuonSystemExtension::Intersection& intersection, MaximumData& maximumData ) const {
+ void MuonStauRecoTool::extractRpcTimingFromMaximum( const Muon::MuonSystemExtension::Intersection& intersection, MaximumData& maximumData ) {
// extract trigger hits per chamber
const MuonHough::MuonLayerHough::Maximum& maximum = *maximumData.maximum;
@@ -1371,7 +1371,7 @@ namespace MuonCombined {
void MuonStauRecoTool::createRpcTimeMeasurementsFromClusters( const Muon::MuonSystemExtension::Intersection& intersection,
const std::vector< Muon::RpcClusterObj>& clusterObjects,
- MuonStauRecoTool::RpcTimeMeasurementVec& rpcTimeMeasurements ) const {
+ MuonStauRecoTool::RpcTimeMeasurementVec& rpcTimeMeasurements ) {
// loop over the clusters
for( auto& cluster : clusterObjects ){
@@ -1411,7 +1411,7 @@ namespace MuonCombined {
}
}
- void MuonStauRecoTool::associateHoughMaxima( MuonStauRecoTool::LayerData& layerData ) const {
+ void MuonStauRecoTool::associateHoughMaxima( MuonStauRecoTool::LayerData& layerData ) {
// get intersection and layer identifiers
const Muon::MuonSystemExtension::Intersection& intersection = layerData.intersection;
@@ -1517,7 +1517,7 @@ namespace MuonCombined {
}
}
- void MuonStauRecoTool::addCandidatesToNtuple( const xAOD::TrackParticle& indetTrackParticle, const MuonStauRecoTool::CandidateVec& candidates, int stage ) const {
+ void MuonStauRecoTool::addCandidatesToNtuple( const xAOD::TrackParticle& indetTrackParticle, const MuonStauRecoTool::CandidateVec& candidates, int stage ) {
if( m_recoValidationTool.empty() ) return;
for( const auto& candidate : candidates ){
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.h b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.h
index 5910d99b2a7..420a7ac29ae 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.h
@@ -149,26 +149,26 @@ namespace MuonCombined {
/** Default AlgTool functions */
MuonStauRecoTool(const std::string& type, const std::string& name, const IInterface* parent);
virtual ~MuonStauRecoTool();
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
/**IMuonCombinedInDetExtensionTool interface: extend ID candidate */
- void extend( const InDetCandidateCollection& inDetCandidates ) const;
+ virtual void extend( const InDetCandidateCollection& inDetCandidates ) override;
private:
/** handle a single candidate */
- void handleCandidate( const InDetCandidate& inDetCandidate ) const;
+ void handleCandidate( const InDetCandidate& inDetCandidate );
/** associate Hough maxima to intersection */
- void associateHoughMaxima( LayerData& layerData ) const;
+ void associateHoughMaxima( LayerData& layerData );
/** extract RPC hit timing */
- void extractRpcTimingFromMaximum( const Muon::MuonSystemExtension::Intersection& intersection, MaximumData& maximumData ) const;
+ void extractRpcTimingFromMaximum( const Muon::MuonSystemExtension::Intersection& intersection, MaximumData& maximumData );
/** create Rpc hit timing for a set of clusters */
void createRpcTimeMeasurementsFromClusters( const Muon::MuonSystemExtension::Intersection& intersection,
const std::vector< Muon::RpcClusterObj>& clusterObjects,
- RpcTimeMeasurementVec& rpcTimeMeasurements ) const;
+ RpcTimeMeasurementVec& rpcTimeMeasurements );
/** find segments for a given maximum */
void findSegments( const Muon::MuonSystemExtension::Intersection& intersection, MaximumData& maximumData,
@@ -177,10 +177,10 @@ namespace MuonCombined {
const ToolHandle<Muon::IMuonSegmentMaker>& segmentMaker ) const;
/** match extension to Hough maxima, extract time measurements, create candidates, run segment finding */
- bool processMuonSystemExtension( const xAOD::TrackParticle& indetTrackParticle, const Muon::MuonSystemExtension& muonSystemExtension, CandidateVec& candidates ) const;
+ bool processMuonSystemExtension( const xAOD::TrackParticle& indetTrackParticle, const Muon::MuonSystemExtension& muonSystemExtension, CandidateVec& candidates );
/** associate Hough maxima and associate time measurements */
- bool extractTimeMeasurements( const Muon::MuonSystemExtension& muonSystemExtension, AssociatedData& associatedData ) const;
+ bool extractTimeMeasurements( const Muon::MuonSystemExtension& muonSystemExtension, AssociatedData& associatedData );
/** create candidates from the beta seeds */
bool createCandidates( const AssociatedData& associatedData, CandidateVec& candidates ) const;
@@ -196,19 +196,19 @@ namespace MuonCombined {
bool extractTimeHits( const MaximumData& maximumData, Muon::TimePointBetaFit::HitVec& hits, const BetaSeed* seed=0 ) const;
/** refine candidates: find segments for the given beta */
- bool refineCandidates( CandidateVec& candidates ) const;
+ bool refineCandidates( CandidateVec& candidates );
/** combine reconstruction */
- bool combineCandidates( const xAOD::TrackParticle& indetTrackParticle, CandidateVec& candidates ) const;
+ bool combineCandidates( const xAOD::TrackParticle& indetTrackParticle, CandidateVec& candidates );
/** resolve ambiguities between the candidates */
- bool resolveAmbiguities( CandidateVec& candidates ) const;
+ bool resolveAmbiguities( CandidateVec& candidates );
/** create final tag object and add it to the inDetCandidate */
void addTag( const InDetCandidate& inDetCandidate, Candidate& candidate ) const;
/** extract time measurements from the track associated with the candidate */
- void extractTimeMeasurementsFromTrack( Candidate& candidate ) const;
+ void extractTimeMeasurementsFromTrack( Candidate& candidate );
/** extract truth from the indetTrackParticle */
TruthInfo* getTruth( const xAOD::TrackParticle& indetTrackParticle ) const;
@@ -221,7 +221,7 @@ namespace MuonCombined {
}
/** helper function to add Candidate to ntuple */
- void addCandidatesToNtuple( const xAOD::TrackParticle& indetTrackParticle, const CandidateVec& candidates, int stage ) const;
+ void addCandidatesToNtuple( const xAOD::TrackParticle& indetTrackParticle, const CandidateVec& candidates, int stage );
/** */
void mdtTimeCalibration( const Identifier& id, float& time, float& error ) const;
--
GitLab