From 35f1f597801db6860ce5fc9e7856b6816bc6325a Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Fri, 23 Aug 2024 19:59:24 -0500
Subject: [PATCH 1/2] fix: use podio::ObjectID::index in CalorimeterHitDigi

---
 src/algorithms/calorimetry/CalorimeterHitDigi.cc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/algorithms/calorimetry/CalorimeterHitDigi.cc b/src/algorithms/calorimetry/CalorimeterHitDigi.cc
index d0e3824f3..abd269ee8 100644
--- a/src/algorithms/calorimetry/CalorimeterHitDigi.cc
+++ b/src/algorithms/calorimetry/CalorimeterHitDigi.cc
@@ -130,16 +130,13 @@ void CalorimeterHitDigi::process(
 
     // find the hits that belong to the same group (for merging)
     std::unordered_map<uint64_t, std::vector<std::size_t>> merge_map;
-    std::size_t ix = 0;
     for (const auto &ahit : *simhits) {
         uint64_t hid = ahit.getCellID() & id_mask;
 
         trace("org cell ID in {:s}: {:#064b}", m_cfg.readout, ahit.getCellID());
         trace("new cell ID in {:s}: {:#064b}", m_cfg.readout, hid);
 
-        merge_map[hid].push_back(ix);
-
-        ix++;
+        merge_map[hid].push_back(ahit.getObjectID().index);
     }
 
     // signal sum

From 80042ee7089b5389b0c80d01346afebf500dc9c0 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Fri, 23 Aug 2024 20:07:09 -0500
Subject: [PATCH 2/2] fix: iwyu, reap what you sow

---
 src/algorithms/calorimetry/CalorimeterHitDigi.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/algorithms/calorimetry/CalorimeterHitDigi.cc b/src/algorithms/calorimetry/CalorimeterHitDigi.cc
index abd269ee8..eb0f0fa53 100644
--- a/src/algorithms/calorimetry/CalorimeterHitDigi.cc
+++ b/src/algorithms/calorimetry/CalorimeterHitDigi.cc
@@ -22,6 +22,7 @@
 #include <algorithms/service.h>
 #include <edm4hep/CaloHitContributionCollection.h>
 #include <fmt/core.h>
+#include <podio/ObjectID.h>
 #include <podio/RelationRange.h>
 #include <algorithm>
 #include <cmath>