From 611fc833b26fd1eb49fbe9e9b65926fa3c2f87af Mon Sep 17 00:00:00 2001 From: Vakhtang Tsulaia <vakhtang.tsulaia@cern.ch> Date: Fri, 13 Aug 2021 18:06:28 +0000 Subject: [PATCH] Merge branch 'ElectronAnalysis_prefer_prefix' into 'master' cppcheck: AsgElectronLikelihoodTool,AsgElectronEfficiencyCorrectionTool prefer prefix See merge request atlas/athena!45750 (cherry picked from commit 2bce2900d3327629dda178fd56f4bfac9465001f) 018c671d cppcheck: AsgElectronLikelihoodTool,AsgElectronEfficiencyCorrectionTool prefer prefix --- .../Root/AsgElectronEfficiencyCorrectionTool.cxx | 2 +- .../Root/AsgElectronLikelihoodTool.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/AsgElectronEfficiencyCorrectionTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/AsgElectronEfficiencyCorrectionTool.cxx index d688a857c03a..a55cd43768e1 100644 --- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/AsgElectronEfficiencyCorrectionTool.cxx +++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/AsgElectronEfficiencyCorrectionTool.cxx @@ -880,7 +880,7 @@ AsgElectronEfficiencyCorrectionTool::currentUncorrSystRegion( for (; itr_ptBEGIN != itr_ptEND; ++itr_ptBEGIN) { std::map<float, std::vector<float>>::const_iterator itr_ptBEGINplusOne = itr_ptBEGIN; - itr_ptBEGINplusOne++; + ++itr_ptBEGINplusOne; // Find the pt bin : Larger or equal from the current and (the next one is // the last or the next one is larger). if (et >= itr_ptBEGIN->first && diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx index 4efbd4bdc63c..f2defbe44010 100644 --- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx +++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx @@ -1156,7 +1156,7 @@ AsgElectronLikelihoodTool::getFcalEt(const EventContext& ctx) const SG::ReadHandle<xAOD::HIEventShapeContainer> HIESCont(m_HIESContKey, ctx); xAOD::HIEventShapeContainer::const_iterator es_itr = HIESCont->begin(); xAOD::HIEventShapeContainer::const_iterator es_end = HIESCont->end(); - for (; es_itr != es_end; es_itr++) { + for (; es_itr != es_end; ++es_itr) { double et = (*es_itr)->et(); const std::string name = (*es_itr)->auxdataConst<std::string>("Summary"); if (name == "FCal") -- GitLab