From d9601c47c8b90ffc37155539c39463775a193ad8 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sun, 7 May 2023 20:39:31 -0400
Subject: [PATCH] Geant4Output2EDM4hep: calorimeter iterator and mapped
---
DDG4/edm4hep/Geant4Output2EDM4hep.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/DDG4/edm4hep/Geant4Output2EDM4hep.cpp b/DDG4/edm4hep/Geant4Output2EDM4hep.cpp
index 1a7020376..a2c0449c9 100644
--- a/DDG4/edm4hep/Geant4Output2EDM4hep.cpp
+++ b/DDG4/edm4hep/Geant4Output2EDM4hep.cpp
@@ -239,10 +239,9 @@ void Geant4Output2EDM4hep::commit( OutputContext<G4Event>& /* ctxt */) {
m_frame.put( std::move(trackerHits.mapped()), trackerHits.key());
}
while ( ! m_calorimeterHits.empty() ) {
- const auto colName = m_calorimeterHits.back().key();
- auto calorimeterHits = m_calorimeterHits.back().extract();
- m_frame.put( std::move(calorimeterHits.first), calorimeterHits.key());
- m_frame.put( std::move(calorimeterHits.second), calorimeterHits.key() + "Contributions");
+ auto calorimeterHits = m_calorimeterHits.extract(m_calorimeterHits.begin());
+ m_frame.put( std::move(calorimeterHits.mapped().first), calorimeterHits.key());
+ m_frame.put( std::move(calorimeterHits.mapped().second), calorimeterHits.key() + "Contributions");
}
m_file->writeFrame(m_frame, m_section_name);
m_particles.clear();
--
GitLab