Skip to content

Commit

Permalink
Change in edm4hep.yaml for consistent naming (#188)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
FinnJohannsen and tmadlener authored Jun 7, 2023
1 parent 03b34bc commit 1a3cdf7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion edm4hep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion test/utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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=$<TARGET_FILE_DIR:edm4hep>:$ENV{LD_LIBRARY_PATH}
LD_LIBRARY_PATH=$<TARGET_FILE_DIR:edm4hep>:$<TARGET_FILE_DIR:podio::podio>:$<$<TARGET_EXISTS:edm4hepRDF>:$<TARGET_FILE_DIR:edm4hepRDF>:>$<TARGET_FILE_DIR:ROOT::Core>:$ENV{LD_LIBRARY_PATH}
ROOT_INCLUDE_PATH=${PROJECT_SOURCE_DIR}/edm4hep:${PROJECT_SOURCE_DIR}/utils/include:$ENV{ROOT_INCLUDE_PATH}
)

0 comments on commit 1a3cdf7

Please sign in to comment.