Merge branch 'main' into rm-compat-old-edm4hep

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
@@ -40,7 +40,7 @@ include(cmake/compiler_output.cmake)
 
 find_package(LCIO REQUIRED)
 find_package(podio REQUIRED)
-find_package(EDM4HEP REQUIRED VERSION 0.10)
+find_package(EDM4HEP 0.10.1 REQUIRED)
 
 add_subdirectory(k4EDM4hep2LcioConv)
 add_subdirectory(standalone)

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))

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<std::string>(podio::collMetadataParamName(name, "CellIDEncoding"));
+      const auto& cellIDStr =
+        metadata.getParameter<std::string>(podio::collMetadataParamName(name, edm4hep::CellIDEncoding));
 
       if (auto coll = dynamic_cast<const edm4hep::TrackCollection*>(edmCollection)) {
         auto lcColl = convTracks(coll, objectMappings.tracks, objectMappings.trackerHits);