From b02eafa5648669e62e6082097a7b1e86d373b076 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Sat, 28 Jan 2017 21:01:37 +0100
Subject: [PATCH] 'gcc7: Fix return value.' (MuonTrackPerformance-01-00-34)
* Tagging MuonTrackPerformance-01-00-34.
* src/MuonTrackPerformanceAlg.cxx: gcc7: Fix return value.
* Tagging MuonTrackPerformance-01-00-33.
* clang warning: struct/class inconsistency.
* Tagging MuonTrackPerformance-01-00-32.
* clang warnings: unused members.
---
.../MuonTrackPerformance/MuonTrackStatisticsTool.h | 4 ++--
.../MuonTrackPerformance/src/MuonPerformanceAlg.cxx | 2 +-
.../MuonTrackPerformance/src/MuonPerformanceAlg.h | 2 +-
.../MuonTrackPerformance/src/MuonRecoValidationTool.h | 2 +-
.../MuonTrackPerformance/src/MuonTrackPerformanceAlg.cxx | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackStatisticsTool.h b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackStatisticsTool.h
index 938bbc42bbf..86faaa912f1 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackStatisticsTool.h
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackStatisticsTool.h
@@ -126,8 +126,8 @@ private:
bool m_doTruth;
MsgStream* m_log;
- bool m_debug;
- bool m_verbose;
+ //bool m_debug;
+ //bool m_verbose;
mutable std::vector<MuonTrackStatisticsTool::TrackCounters* > m_allCounters;
mutable std::vector<MuonTrackStatisticsTool::TruthTrackCounters* > m_allTruthCounters;
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.cxx b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.cxx
index f612927bfe2..da76a872584 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.cxx
@@ -34,7 +34,7 @@ MuonPerformanceAlg::MuonPerformanceAlg(const std::string& name, ISvcLocator* pSv
m_writeToFile (false),
m_nevents(0),
m_printer("Muon::MuonEDMPrinterTool/MuonEDMPrinterTool"),
- m_storeGate(NULL),
+ //m_storeGate(NULL),
m_eventInfo(NULL),
m_runNumber(0),
m_eventNumber(0)
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.h b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.h
index 9bbd76a4020..c19725e0a44 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.h
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.h
@@ -64,7 +64,7 @@ class MuonPerformanceAlg : public AthAlgorithm {
std::vector<int> m_nreco10;
ToolHandle<Muon::MuonEDMPrinterTool> m_printer;
- StoreGateSvc* m_storeGate;
+ //StoreGateSvc* m_storeGate;
const xAOD::EventInfo* m_eventInfo;
int m_runNumber;
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonRecoValidationTool.h b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonRecoValidationTool.h
index 54b72af85b4..54eb3dcd28e 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonRecoValidationTool.h
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonRecoValidationTool.h
@@ -41,7 +41,7 @@ namespace Muon {
class IMuonHitTimingTool;
class MuonSegment;
class MuonClusterOnTrack;
- class MuonCandidate;
+ struct MuonCandidate;
class MuonRecoValidationTool : public IMuonRecoValidationTool, virtual public IIncidentListener, public AthAlgTool {
public:
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonTrackPerformanceAlg.cxx b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonTrackPerformanceAlg.cxx
index 878fb4b1f1d..46583e5d5a9 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonTrackPerformanceAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonTrackPerformanceAlg.cxx
@@ -144,7 +144,7 @@ bool MuonTrackPerformanceAlg::handleSegmentCombinations() {
StatusCode sc = evtStore()->retrieve(combiCol,m_segmentCombiLocation);
if (sc.isFailure() ) {
*m_log << MSG::WARNING << " Could not find MuonSegmentCombinationCollection at " << m_segmentCombiLocation <<endmsg;
- return StatusCode::RECOVERABLE;
+ return true;
}else{
if( m_debug ) *m_log << MSG::DEBUG << " Retrieved MuonSegmentCombinationCollection " << combiCol->size() << endmsg;
}
--
GitLab