From 491c04347294ec6c83e09ac6ff4bda8b6b7e76d3 Mon Sep 17 00:00:00 2001 From: Thomas Madlener Date: Wed, 8 Nov 2023 10:46:22 +0100 Subject: [PATCH 1/3] Release Notes for v00-06-01 --- doc/ReleaseNotes.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/ReleaseNotes.md b/doc/ReleaseNotes.md index fa3e5ae8..9655366b 100644 --- a/doc/ReleaseNotes.md +++ b/doc/ReleaseNotes.md @@ -1,3 +1,12 @@ +# v00-06-01 + +* 2023-11-06 tmadlener ([PR#36](https://github.com/key4hep/k4EDM4hep2LcioConv/pull/36)) + - Make sure to convert the full content of `edm4hep::Clusters` to LCIO clusters, including `subdetectorEnergies` and the related calorimeter hits. Set the `contribution` 1.0 because that seems to be the only value in use. + - Add tests that cover this part of the converter. + +* 2023-11-02 jmcarcell ([PR#33](https://github.com/key4hep/k4EDM4hep2LcioConv/pull/33)) + - Use ExternalData to download the test data at build time. See https://github.com/AIDASoft/podio/pull/508 + # v00-06 * 2023-10-19 jmcarcell ([PR#31](https://github.com/key4hep/k4EDM4hep2LcioConv/pull/31)) From cf521b56f5fbaf64c6789a5914d63a24c4b70e33 Mon Sep 17 00:00:00 2001 From: Thomas Madlener Date: Wed, 8 Nov 2023 10:46:23 +0100 Subject: [PATCH 2/3] Updating version to v00-06-01 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f78124f5..44da4387 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(k4EDM4hep2LcioConv) # project version set( ${PROJECT_NAME}_VERSION_MAJOR 0 ) set( ${PROJECT_NAME}_VERSION_MINOR 6 ) -set( ${PROJECT_NAME}_VERSION_PATCH 0 ) +set( ${PROJECT_NAME}_VERSION_PATCH 1 ) set( ${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}" ) # Define a default build type can be overriden by passing From a06983bbed75c664392e0d7659e0907a04effdda Mon Sep 17 00:00:00 2001 From: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com> Date: Wed, 8 Nov 2023 10:46:48 +0100 Subject: [PATCH 3/3] Use the new edm4hep::CellIDEncoding (#34) * Use the new edm4hep::CellIDEncoding * Add a minimum version of EDM4hep --------- Co-authored-by: jmcarcell --- CMakeLists.txt | 2 +- k4EDM4hep2LcioConv/src/k4EDM4hep2LcioConv.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 44da4387..494cb327 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ include(cmake/compiler_output.cmake) find_package(LCIO REQUIRED) find_package(podio REQUIRED) -find_package(EDM4HEP REQUIRED) +find_package(EDM4HEP 0.10.1 REQUIRED) add_subdirectory(k4EDM4hep2LcioConv) add_subdirectory(standalone) diff --git a/k4EDM4hep2LcioConv/src/k4EDM4hep2LcioConv.cpp b/k4EDM4hep2LcioConv/src/k4EDM4hep2LcioConv.cpp index 9da6717c..657d5a0a 100644 --- a/k4EDM4hep2LcioConv/src/k4EDM4hep2LcioConv.cpp +++ b/k4EDM4hep2LcioConv/src/k4EDM4hep2LcioConv.cpp @@ -1,4 +1,5 @@ #include "k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h" +#include "edm4hep/Constants.h" #include "EVENT/MCParticle.h" namespace EDM4hep2LCIOConv { @@ -33,7 +34,8 @@ namespace EDM4hep2LCIOConv { for (const auto& name : collections) { const auto edmCollection = edmEvent.get(name); - const auto& cellIDStr = metadata.getParameter(podio::collMetadataParamName(name, "CellIDEncoding")); + const auto& cellIDStr = + metadata.getParameter(podio::collMetadataParamName(name, edm4hep::CellIDEncoding)); if (auto coll = dynamic_cast(edmCollection)) { auto lcColl = convTracks(coll, objectMappings.tracks, objectMappings.trackerHits);