From 94e53b77343a05c4605aad7e6f5016e184e9c44f Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Thu, 12 Dec 2019 16:29:02 +0100
Subject: [PATCH] AnalysisJiveXML: Fix clang warnings.
clang warnings:
- unused variables
- string + int
---
.../AnalysisJiveXML/src/AODCaloClusterRetriever.cxx | 4 ++--
.../AnalysisJiveXML/src/AODJetRetriever.cxx | 4 ++--
.../AnalysisJiveXML/src/BJetRetriever.cxx | 4 ++--
.../AnalysisJiveXML/src/TruthParticleRetriever.cxx | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODCaloClusterRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODCaloClusterRetriever.cxx
index 1e8d0cbeb2b..dec158e22ba 100755
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODCaloClusterRetriever.cxx
+++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODCaloClusterRetriever.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "AnalysisJiveXML/AODCaloClusterRetriever.h"
@@ -104,7 +104,7 @@ namespace JiveXML {
}
}else {
//obtain all collections with the given keys
- std::vector<std::string>::const_iterator keyIter,endIter;
+ std::vector<std::string>::const_iterator keyIter;
for ( keyIter=m_otherKeys.begin(); keyIter!=m_otherKeys.end(); ++keyIter ){
StatusCode sc = evtStore()->retrieve( ccc, (*keyIter) );
if (!sc.isFailure()) {
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODJetRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODJetRetriever.cxx
index 9860a696176..203a6b12bce 100755
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODJetRetriever.cxx
+++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODJetRetriever.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "AnalysisJiveXML/AODJetRetriever.h"
@@ -85,7 +85,7 @@ namespace JiveXML {
}
}else {
//obtain all collections with the given keys
- std::vector<std::string>::const_iterator keyIter,endIter;
+ std::vector<std::string>::const_iterator keyIter;
for ( keyIter=m_otherKeys.begin(); keyIter!=m_otherKeys.end(); ++keyIter ){
if ( !evtStore()->contains<JetCollection>( (*keyIter) ) ){ continue; } // skip if not in SG
StatusCode sc = evtStore()->retrieve( jets, (*keyIter) );
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/BJetRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/BJetRetriever.cxx
index ea9b56a951c..ddbdd112682 100755
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/BJetRetriever.cxx
+++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/BJetRetriever.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "AnalysisJiveXML/BJetRetriever.h"
@@ -86,7 +86,7 @@ namespace JiveXML {
}
}else {
//obtain all collections with the given keys
- std::vector<std::string>::const_iterator keyIter,endIter;
+ std::vector<std::string>::const_iterator keyIter;
for ( keyIter=m_otherKeys.begin(); keyIter!=m_otherKeys.end(); ++keyIter ){
if ( !evtStore()->contains<JetCollection>( (*keyIter) ) ){ continue; } // skip if not in SG
StatusCode sc = evtStore()->retrieve( jets, (*keyIter) );
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TruthParticleRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TruthParticleRetriever.cxx
index 6c9cfe7e43a..037cc35df8c 100755
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TruthParticleRetriever.cxx
+++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TruthParticleRetriever.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "AnalysisJiveXML/TruthParticleRetriever.h"
@@ -78,7 +78,7 @@ namespace JiveXML {
samePdgIdFlag = false;
initialProcessFlag = false;
protectedParticleFlag = false;
- statusList += (*mcpartItr)->status() + "_";
+ statusList += std::to_string((*mcpartItr)->status()) + "_";
if ( (*mcpartItr)->et()/CLHEP::GeV < m_truthPtCut ){ continue; }
/*
--
GitLab