From 842f6905ac1ba4060d3a7785daeb8650eab4792a Mon Sep 17 00:00:00 2001
From: Christopher Dilks <christopher.j.dilks@gmail.com>
Date: Mon, 15 Aug 2022 19:36:55 -0400
Subject: [PATCH] Squashed commit of the following:
commit 5a106418aba4be17e1b614da2f0e41601fb57a0e
Author: Christopher Dilks <christopher.j.dilks@gmail.com>
Date: Fri Aug 12 19:12:40 2022 -0400
modified: eic_data.yaml
commit 0d8eb51512fcaa7bd657f5e05314c7ece16e6de4
Author: Christopher Dilks <christopher.j.dilks@gmail.com>
Date: Fri Aug 12 19:10:15 2022 -0400
cherry pick CMakeLists from `use-upstream-edm4hep` branch
---
CMakeLists.txt | 5 ++++-
eic_data.yaml | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29ab2a9..6876f05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
find_package(ROOT REQUIRED COMPONENTS Core RIO Tree)
include(${ROOT_USE_FILE})
-PODIO_GENERATE_DATAMODEL(eicd eic_data.yaml headers sources OUTPUT_FOLDER ${CMAKE_CURRENT_BINARY_DIR})
+PODIO_GENERATE_DATAMODEL(eicd eic_data.yaml headers sources
+ UPSTREAM_EDM edm4hep:${EDM4HEP_DATA_DIR}/edm4hep.yaml
+ OUTPUT_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
+ )
add_library(eicd SHARED
${sources}
diff --git a/eic_data.yaml b/eic_data.yaml
index f524eb5..0317ef5 100644
--- a/eic_data.yaml
+++ b/eic_data.yaml
@@ -280,7 +280,7 @@ datatypes:
- eicd::CherenkovThetaAngleMeasurement angles // Evaluated Cherenkov angles for different radiators
OneToOneRelations:
## @TODO: should it be one-to-one?
- - eicd::ReconstructedParticle associatedParticle // associated reconstructed particle
+ - edm4hep::MCParticle associatedParticle // associated reconstructed particle
## ==========================================================================
## Calorimetry
--
GitLab