From 1a3cdf716095d1f7a968bb6652272db5fb6d521e Mon Sep 17 00:00:00 2001 From: FinnJohannsen <57949495+FinnJohannsen@users.noreply.github.com> Date: Wed, 7 Jun 2023 10:54:18 +0200 Subject: [PATCH] Change in edm4hep.yaml for consistent naming (#188) * Change in edm4hep.yaml for consistent naming Changed the name of one VectorMember of edm4hep::track from subDetectorHitNumbers to subdetectorHitNumbers to be consistent with other spellings of the word subdetector in the yaml and in lcio. * Make test environment more robust against external environment --------- Co-authored-by: tmadlener --- edm4hep.yaml | 2 +- test/utils/CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/edm4hep.yaml b/edm4hep.yaml index ca84e529e..6e7ecc9ec 100644 --- a/edm4hep.yaml +++ b/edm4hep.yaml @@ -381,7 +381,7 @@ datatypes : - float dEdxError //error of dEdx. - float radiusOfInnermostHit //radius of the innermost hit that has been used in the track fit VectorMembers: - - int32_t subDetectorHitNumbers //number of hits in particular subdetectors.Check/set collection variable TrackSubdetectorNames for decoding the indices + - int32_t subdetectorHitNumbers //number of hits in particular subdetectors.Check/set collection variable TrackSubdetectorNames for decoding the indices - edm4hep::TrackState trackStates //track states - edm4hep::Quantity dxQuantities // different measurements of dx quantities OneToManyRelations: diff --git a/test/utils/CMakeLists.txt b/test/utils/CMakeLists.txt index fde786392..94a8e66f7 100644 --- a/test/utils/CMakeLists.txt +++ b/test/utils/CMakeLists.txt @@ -23,5 +23,6 @@ catch_discover_tests(unittests) add_test(NAME pyunittests COMMAND python -m unittest discover -s ${CMAKE_CURRENT_LIST_DIR}) set_property(TEST pyunittests PROPERTY ENVIRONMENT - LD_LIBRARY_PATH=$:$ENV{LD_LIBRARY_PATH} + LD_LIBRARY_PATH=$:$:$<$:$:>$:$ENV{LD_LIBRARY_PATH} + ROOT_INCLUDE_PATH=${PROJECT_SOURCE_DIR}/edm4hep:${PROJECT_SOURCE_DIR}/utils/include:$ENV{ROOT_INCLUDE_PATH} )