Merge branch 'main' into trajectory

CMakeLists.txt

@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.12)
 project(EDM4EIC
   LANGUAGES CXX)
 
-SET( ${PROJECT_NAME}_VERSION_MAJOR 4 )
+SET( ${PROJECT_NAME}_VERSION_MAJOR 5 )
 SET( ${PROJECT_NAME}_VERSION_MINOR 0 )
 SET( ${PROJECT_NAME}_VERSION_PATCH 0 )
 SET( ${PROJECT_NAME}_VERSION  "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}" )

edm4eic.yaml

@@ -142,12 +142,18 @@ components:
       declaration: "
         Cov6f() : covariance{} {}\n
         Cov6f(std::array<float, 21> vcov) : covariance{vcov}{}\n
-	float& operator()(unsigned i, unsigned j) {\n
-	  if(i > j) {\n
-	    std::swap(i, j);\n
-	    }\n
-	  return covariance[i + 1 + (j + 1) * (j) / 2 - 1];\n
-	}\n
+        float operator()(unsigned i, unsigned j) const {\n
+          if(i > j) {\n
+            std::swap(i, j);\n
+            }\n
+          return covariance[i + 1 + (j + 1) * (j) / 2 - 1];\n
+        }\n
+        float& operator()(unsigned i, unsigned j) {\n
+          if(i > j) {\n
+            std::swap(i, j);\n
+            }\n
+          return covariance[i + 1 + (j + 1) * (j) / 2 - 1];\n
+        }\n
       "
 
   ## A point along a track

utils/CMakeLists.txt

@@ -36,40 +36,45 @@ install(TARGETS edm4eic_utils
 
 if(CLI11_FOUND)
 
-  add_executable(edm4eic_merge src/merge.cpp)
-
-  target_compile_features(edm4eic_merge
-    PUBLIC cxx_auto_type
-    PUBLIC cxx_trailing_return_types
-    PUBLIC cxx_std_17
-    PRIVATE cxx_variadic_templates
-    )
-
-  target_compile_options(edm4eic_merge PRIVATE
-    -Wno-extra
-    -Wno-ignored-qualifiers
-    -Wno-overloaded-virtual
-    -Wno-shadow
-    )
-
-  target_include_directories(edm4eic_merge
-    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    PUBLIC $<INSTALL_INTERFACE:include>
-    )
-
-  target_link_libraries(edm4eic_merge
-    PUBLIC edm4eic
-    PUBLIC EDM4HEP::edm4hep
-    PUBLIC podio::podio podio::podioRootIO
-    PUBLIC ROOT::GenVector ROOT::MathCore)
-
-  install(TARGETS edm4eic_merge
-    EXPORT ${PROJECT_NAME}Targets
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
+  if(${podio_VERSION} VERSION_LESS 0.17.4)
+
+    # EventStore-based merging
+    add_executable(edm4eic_event_merge src/event_merge.cpp)
+
+    target_compile_features(edm4eic_event_merge
+      PUBLIC cxx_auto_type
+      PUBLIC cxx_trailing_return_types
+      PUBLIC cxx_std_17
+      PRIVATE cxx_variadic_templates
+      )
+
+    target_compile_options(edm4eic_event_merge PRIVATE
+      -Wno-extra
+      -Wno-ignored-qualifiers
+      -Wno-overloaded-virtual
+      -Wno-shadow
+      )
+
+    target_include_directories(edm4eic_event_merge
+      PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+      PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+      PUBLIC $<INSTALL_INTERFACE:include>
+      )
+
+    target_link_libraries(edm4eic_event_merge
+      PUBLIC edm4eic
+      PUBLIC EDM4HEP::edm4hep
+      PUBLIC podio::podio podio::podioRootIO
+      PUBLIC ROOT::GenVector ROOT::MathCore)
+
+    install(TARGETS edm4eic_event_merge
+      EXPORT ${PROJECT_NAME}Targets
+      LIBRARY DESTINATION lib
+      ARCHIVE DESTINATION lib
+      RUNTIME DESTINATION bin
+      INCLUDES DESTINATION include
+      )
+
+  endif()
 
 endif()