Skip to content

External wiring example #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nathanwbrei wants to merge 3 commits into
base: master
Choose a base branch
from
Open

External wiring example #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85e3a59
Add example wrapper program
nathanwbrei Sep 16, 2025
9491b19
Improve csv writer plugin
nathanwbrei Sep 17, 2025
2b03ee9
Remove examples/misc/CsvWriter,JObjectDatamodel
nathanwbrei Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions cmake/AddJanaLibrary.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ macro(add_jana_library library_name)

if (${PROJECT_NAME} STREQUAL "jana2")
# This is an internal plugin
set(INSTALL_NAMESPACE "JANA")
if (NOT DEFINED INSTALL_NAMESPACE)
set(INSTALL_NAMESPACE "JANA")
endif()
set(JANA_NAMESPACE "")
if (NOT LIBRARY_EXPORT)
set(LIBRARY_EXPORT "jana2_targets")
Expand Down Expand Up @@ -66,20 +68,24 @@ macro(add_jana_library library_name)

# Handle public headers
if (LIBRARY_PUBLIC_HEADER)
# Include files get installed to $CMAKE_PREFIX_PATH/$INSTALL_NAMESPACE/$CWD_NAME
# First we extract $CWD_NAME
get_filename_component(CWD_NAME "${CMAKE_CURRENT_SOURCE_DIR}" NAME)

set_target_properties(${library_name} PROPERTIES
PUBLIC_HEADER "${LIBRARY_PUBLIC_HEADER}"
)
target_include_directories(${library_name}
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:include/${INSTALL_NAMESPACE}/${library_name}>
$<INSTALL_INTERFACE:include/${INSTALL_NAMESPACE}/${CWD_NAME}>
)
endif()

# Install target
install(TARGETS ${library_name}
EXPORT ${LIBRARY_EXPORT}
PUBLIC_HEADER DESTINATION include/${INSTALL_NAMESPACE}/${library_name}
PUBLIC_HEADER DESTINATION include/${INSTALL_NAMESPACE}/${CWD_NAME}
LIBRARY DESTINATION lib
)

Expand Down
4 changes: 3 additions & 1 deletion cmake/AddJanaPlugin.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ macro(add_jana_plugin plugin_name)

if (${PROJECT_NAME} STREQUAL "jana2")
# This is an internal plugin
set(INSTALL_NAMESPACE "JANA")
if (NOT DEFINED INSTALL_NAMESPACE)
set(INSTALL_NAMESPACE "JANA")
endif()
set(JANA_NAMESPACE "")
if (NOT PLUGIN_EXPORT)
set(PLUGIN_EXPORT "jana2_targets")
Expand Down
1 change: 0 additions & 1 deletion src/examples/misc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

add_subdirectory(CsvWriter)
add_subdirectory(DstExample)
add_subdirectory(Tutorial)
add_subdirectory(EventGroupExample)
Expand Down
7 changes: 0 additions & 7 deletions src/examples/misc/CsvWriter/CMakeLists.txt
View file
Open in desktop

This file was deleted.

139 changes: 0 additions & 139 deletions src/examples/misc/CsvWriter/CsvWriter.cc
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/examples/misc/CsvWriter/README.md
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions src/examples/misc/JObjectDatamodel/CMakeLists.txt
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions src/examples/misc/JObjectDatamodel/CalorimeterCluster.h
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions src/examples/misc/JObjectDatamodel/CalorimeterHit.h
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions src/examples/misc/JObjectDatamodel/F250Hit.h
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/examples/tutorial_with_lightweight_datamodel/01_datamodel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ add_library(lw_datamodel INTERFACE)

target_include_directories(lw_datamodel INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:include/jana2_tutorial_lightweight/datamodel>
$<INSTALL_INTERFACE:include/jana2_tutorial_lightweight/01_datamodel>
)

file(GLOB lw_datamodel_headers "*.h")

install(FILES ${lw_datamodel_headers}
DESTINATION include/jana2_tutorial_lightweight/datamodel)
DESTINATION include/jana2_tutorial_lightweight/01_datamodel)

install(TARGETS lw_datamodel
EXPORT jana2_targets)
Expand Down
12 changes: 10 additions & 2 deletions src/examples/tutorial_with_lightweight_datamodel/02_random_hit_source/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@

add_jana_library(lw_random_hit_source_common
SOURCES RandomHitSource.cc
PUBLIC_HEADER RandomHitSource.h
)
target_link_libraries(lw_random_hit_source_common PUBLIC lw_datamodel)

add_jana_plugin(lw_random_hit_source)
target_link_libraries(lw_random_hit_source PUBLIC lw_datamodel)
add_jana_plugin(lw_random_hit_source
SOURCES random_hit_source.cc
)
target_link_libraries(lw_random_hit_source PUBLIC lw_random_hit_source_common)

add_test(NAME examples-lw-00-smoketest COMMAND jana -Pplugins=lw_random_hit_source -Pjana:nevents=10)

set_tests_properties(examples-lw-00-smoketest PROPERTIES LABELS "examples")
Loading
Loading