From c815042786fbfcb7ec68cc4368fd5ddaeea99f42 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Tue, 10 May 2022 11:28:12 -0400
Subject: [PATCH] LArCalibTools: Fix cppcheck warnings.

Members with identical names in base/derived classes.
---
 LArCalorimeter/LArCalibTools/LArCalibTools/LArSC2Ntuple.h | 3 +--
 LArCalorimeter/LArCalibTools/src/LArSC2Ntuple.cxx         | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/LArCalorimeter/LArCalibTools/LArCalibTools/LArSC2Ntuple.h b/LArCalorimeter/LArCalibTools/LArCalibTools/LArSC2Ntuple.h
index 597ba55fbfa..18ab92a45b1 100644
--- a/LArCalorimeter/LArCalibTools/LArCalibTools/LArSC2Ntuple.h
+++ b/LArCalorimeter/LArCalibTools/LArCalibTools/LArSC2Ntuple.h
@@ -18,12 +18,11 @@ class LArSC2Ntuple : public LArDigits2Ntuple
   virtual StatusCode execute() override;
  private:
 
-  long m_event;
+  long m_sc2event = 0;
 
   Gaudi::Property< std::vector<std::string> > m_contKeys{ this, "SCContainerKeys", {},"which containers to dump"};
   Gaudi::Property< bool > m_overwriteEventNumber{this, "OverwriteEventNumber", false, "overwrite the event number from EventInfo ?"};
 
-  NTuple::Item<short> m_ELVL1Id;
   NTuple::Item<short> m_latomeChannel;
 
   NTuple::Item<float>  m_raw_energy;
diff --git a/LArCalorimeter/LArCalibTools/src/LArSC2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArSC2Ntuple.cxx
index 3e617629bd2..be49228d1ab 100644
--- a/LArCalorimeter/LArCalibTools/src/LArSC2Ntuple.cxx
+++ b/LArCalorimeter/LArCalibTools/src/LArSC2Ntuple.cxx
@@ -132,7 +132,7 @@ StatusCode LArSC2Ntuple::execute()
   const EventContext& ctx = Gaudi::Hive::currentContext();
 
   ATH_MSG_DEBUG( "LArSC2Ntuple in execute" ); 
-  m_event++;
+  m_sc2event++;
   unsigned long long thisevent = 0;
   unsigned long	thisbcid       = 0;
 
@@ -248,7 +248,7 @@ StatusCode LArSC2Ntuple::execute()
   for( int c    = 0;c<cellsno;++c ){
     if(m_fillBCID) m_bcid	   = thisbcid; 
     m_IEvent	   = thisevent;
-    if(m_overwriteEventNumber) m_IEvent   = m_event;
+    if(m_overwriteEventNumber) m_IEvent   = m_sc2event;
     if( hasDigitContainer ){
 
       const LArDigit* digi   = DigitContainer.at(c);     
-- 
GitLab