From c14e3b24a9f4edd6871fea20cc745de35d442def Mon Sep 17 00:00:00 2001
From: Sven Menke <sven.menke@cern.ch>
Date: Wed, 17 Nov 2021 21:41:27 +0100
Subject: [PATCH] bugfix for other two accidentally deleted index increments --
 relevant for LocalHadronCalibration

---
 .../CaloCalibHitRec/src/CaloCalibClusterMomentsMaker.cxx       | 3 ++-
 .../CaloCalibHitRec/src/CaloCalibClusterMomentsMaker2.cxx      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker.cxx b/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker.cxx
index 3e45f3be99c..5b34bf728da 100644
--- a/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker.cxx
+++ b/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker.cxx
@@ -416,8 +416,9 @@ CaloCalibClusterMomentsMaker::execute(const EventContext& ctx,
 	engCalibDead[ii].resize(theClusColl->size(),0);
 	eOut[ii] = 0;
 	eDead[ii] = 0;
-	iClus = 0;
+	iClus = -1;
         for (xAOD::CaloCluster * theCluster : *theClusColl) {
+	  ++iClus;
 	  if ( engCalibTot[iClus] > 0 ) {
 	    int iEtaSign = 1;
 	    if ( theCluster->eta() < 0 )
diff --git a/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker2.cxx b/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker2.cxx
index 5ed4debecdf..eb9ce78bae2 100644
--- a/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker2.cxx
+++ b/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker2.cxx
@@ -429,8 +429,9 @@ CaloCalibClusterMomentsMaker2::execute(const EventContext& ctx,
          (ii == 1 && (m_doOutOfClusterM || m_doDeadM || (m_doDeadEnergySharing && m_MatchDmType==kMatchDmMedium) ) ) || 
          (ii == 2 && (m_doOutOfClusterT || m_doDeadT || (m_doDeadEnergySharing && m_MatchDmType==kMatchDmTight)) ) ) {
       engCalibOut[ii].resize(theClusColl->size(),0);
-      iClus = 0;
+      iClus = -1;
       for (const xAOD::CaloCluster * theCluster : *theClusColl) {
+	++iClus;
         MyClusInfo& clusInfo = clusInfoVec[iClus];
 
         if ( clusInfo.engCalibIn.engTot > 0 ) {
-- 
GitLab