From 09f77a5ef247b1e82c7127942283d0488ab7ad77 Mon Sep 17 00:00:00 2001
From: scott snyder <scott.snyder@cern.ch>
Date: Wed, 5 Apr 2017 15:37:05 +0200
Subject: [PATCH] ElectronPhotonSelectorTools: Comply with ATLAS naming
 conventions.

Private class members should start with m_.
Identifiers should not start with underscores.
---
 .../AsgElectronChargeIDSelectorTool.h                       | 6 +++---
 .../Root/AsgElectronChargeIDSelectorTool.cxx                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronChargeIDSelectorTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronChargeIDSelectorTool.h
index 94b8ab7f873..a1c925ae341 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronChargeIDSelectorTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronChargeIDSelectorTool.h
@@ -4,8 +4,8 @@
 
 // Dear emacs, this is -*-c++-*-
 
-#ifndef __ASGELECTRONCHARGEIDSELECTORTOOL__
-#define __ASGELECTRONCHARGEIDSELECTORTOOL__
+#ifndef ELECTRONPHOTONSELECTORTOOLS_ASGELECTRONCHARGEIDSELECTORTOOL_H
+#define ELECTRONPHOTONSELECTORTOOLS_ASGELECTRONCHARGEIDSELECTORTOOL_H
 // Atlas includes
 #include "AsgTools/AsgTool.h"
 #include "MVAUtils/BDT.h"
@@ -125,7 +125,7 @@ private:
 
   //BDT instances for different ID operating points (Tight, Medium, Loose) and the vector corresponds to n-fold
   const unsigned m_nfold  =1;
-  const unsigned bdt_index=0;
+  const unsigned m_bdt_index=0;
   std::vector<MVAUtils::BDT*> m_v_bdts;
 
   TString m_pid_name;
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronChargeIDSelectorTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronChargeIDSelectorTool.cxx
index a8e51f12fda..47670764939 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronChargeIDSelectorTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronChargeIDSelectorTool.cxx
@@ -427,7 +427,7 @@ const Root::TResult& AsgElectronChargeIDSelectorTool::calculate( const xAOD::Ele
   //   std::cout<<"\t kmdebug: "<<m_inputVars.at(i)<<"\t("<<pointer<<")\t = "<<*pointer<<std::endl; i++;
   // }
 
-  double bdt_output = m_v_bdts.at(bdt_index)->GetGradBoostMVA(m_v_bdts.at(bdt_index)->GetPointers());
+  double bdt_output = m_v_bdts.at(m_bdt_index)->GetGradBoostMVA(m_v_bdts.at(m_bdt_index)->GetPointers());
   ATH_MSG_DEBUG("ECIDS-BDT= "<<bdt_output);
 
   m_resultBDT.setResult(m_resultPosition_bdt,bdt_output);
-- 
GitLab