Skip to content

Update petsird v0.8.0 and yardl 0.6.5 #14

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

Merged
KrisThielemans merged 4 commits into from
Nov 10, 2025
Merged

Update petsird v0.8.0 and yardl 0.6.5 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c70a313
use yardl 0.6.5
KrisThielemans Nov 8, 2025
c370b7f
use PETSIRD 0.8.0
KrisThielemans Nov 8, 2025
f2dd3bb
update for new PETSIRD CMake
KrisThielemans Nov 10, 2025
4fd989f
justfile: empty run target for illustration
KrisThielemans Nov 10, 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
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ RUN mkdir -p /home/vscode/.local/share/CMakeTools \
&& chown vscode:conda /home/vscode/.local/share/CMakeTools/cmake-tools-kits.json

# Install the yardl tool
ARG YARDL_VERSION=0.6.3
ARG YARDL_VERSION=0.6.5
RUN wget --quiet "https://github.com/microsoft/yardl/releases/download/v${YARDL_VERSION}/yardl_${YARDL_VERSION}_linux_x86_64.tar.gz" \
&& tar -xzf "yardl_${YARDL_VERSION}_linux_x86_64.tar.gz" \
&& mv yardl "/opt/conda/envs/${CONDA_ENVIRONMENT_NAME}/bin/" \
Expand Down
2 changes: 1 addition & 1 deletion PETSIRD
Open in desktop
Submodule PETSIRD updated 23 files
+3 −3 .pre-commit-config.yaml
+10 −1 cpp/CMakeLists.txt
+15 −0 cpp/README.md
+9 −8 cpp/helpers/CMakeLists.txt
+16 −7 cpp/helpers/include/petsird_helpers.h
+6 −1 cpp/helpers/include/petsird_helpers/create.h
+1 −1 cpp/helpers/include/petsird_helpers/geometry.h
+131 −80 cpp/helpers/petsird_analysis.cpp
+16 −9 cpp/helpers/petsird_generator.cpp
+1 −1 justfile
+1 −1 matlab/toolbox/+petsird/+helpers/generator.m
+0 −7 model/CoincidenceEvent.yml
+22 −6 model/DetectionEfficiencies.yml
+3 −1 model/DetectorInformation.yml
+38 −0 model/Events.yml
+71 −14 model/Protocol.yml
+63 −8 model/ScannerInformation.yml
+0 −12 model/TripleEvent.yml
+1 −1 model/_package.yml
+47 −11 python/petsird/helpers/__init__.py
+112 −74 python/petsird/helpers/analysis.py
+351 −97 python/petsird/helpers/generator.py
+8 −2 python/petsird/helpers/plot_scanner.py
10 changes: 3 additions & 7 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,15 @@ else()
add_compile_options(-Wall -Wextra -pedantic)
endif()

set(PETSIRD_dir ../PETSIRD/cpp/generated)
add_subdirectory(${PETSIRD_dir} PETSIRD_generated)
set(PETSIRD_dir ../PETSIRD/cpp/)
add_subdirectory(${PETSIRD_dir} PETSIRD)

# Add any packages, below is an example for ROOT (unlikely you'll need that one though!)
# find_package(ROOT REQUIRED COMPONENTS Tree)

# Example lines for a new executable
# add_executable(my_prog my_prog.cpp)
# target_include_directories(my_prog PUBLIC ${PETSIRD_dir})
# needed for helpers
# target_include_directories(my_prog PUBLIC ${PETSIRD_dir}/..)
# target_include_directories(my_prog PUBLIC ${PETSIRD_dir}/../helpers/include)
# target_link_libraries(my_prog PUBLIC petsird_generated)
# target_link_libraries(my_prog PUBLIC petsird_helpers)

# add any dependencies on packages here
# target_link_libraries(my_prog PUBLIC ROOT::Tree)
Expand Down
2 changes: 2 additions & 0 deletions justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ default: run
cd cpp/build; \
ninja

@run: build
echo Something here
Loading