lars/minicalosim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

print commit hash on import; fix event_id offset in multi-core steps

Browse Source 
G4Calo.py prints the commit at import time, resolved via a
minicalo_version.py file (baked in by Docker) or git rev-parse
from the file's directory as fallback.

event_id in the Steps ntuple restarts from 0 in each subprocess;
_assemble_results_to_mini_df now accepts per-file event_id_offsets
so IDs are globally unique after merging. run_batch passes cumulative
nevents as offsets when loading the Steps tree.

Dockerfiles write minicalo_version.py before copying Python files.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Lars Bogner
2026-06-08 16:35:31 +02:00
parent f5c832fd44
commit 5fc50bcefc
4 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/Dockerfile
+3 -1
View File
@@ -101,7 +101,9 @@ RUN cd /root/minicalosim && git checkout $COMMIT && \
mkdir -p build && cd build && rm -rf * && cmake ../ && make -j4
RUN cp /root/minicalosim/build/minicalo* /root/minicalosim/bind/G4Calo.py /root/minicalosim/bind/minicalo_tools.py /root/minicalosim/bind/minipandas.py /usr/local/lib/python3.10/dist-packages/
RUN echo "commit = '${COMMIT}'" > /root/minicalosim/bind/minicalo_version.py
RUN cp /root/minicalosim/build/minicalo* /root/minicalosim/bind/G4Calo.py /root/minicalosim/bind/minicalo_tools.py /root/minicalosim/bind/minipandas.py /root/minicalosim/bind/minicalo_version.py /usr/local/lib/python3.10/dist-packages/
RUN cp /root/minicalosim/bind/G4Calo_exec.py /usr/local/bin/
docker/Dockerfile-cpu
+2 -1
View File
@@ -99,7 +99,8 @@ ADD minicalosim /root/minicalosim
RUN cd /root/minicalosim && git checkout $COMMIT && \
git submodule update --init lib/pybind11 && \
mkdir -p build && cd build && rm -rf * && cmake ../ && make -j$(nproc) &&\
cp minicalo* ../bind/G4Calo.py /usr/local/lib/python3.8/dist-packages/
echo "commit = '${COMMIT}'" > ../bind/minicalo_version.py && \
cp minicalo* ../bind/G4Calo.py ../bind/minicalo_version.py /usr/local/lib/python3.8/dist-packages/
docker/Dockerfile-mini
+3 -1
View File
@@ -52,9 +52,11 @@ RUN cd /root/minicalosim && git checkout $COMMIT && \
cmake --build build --parallel $(nproc) && \
cp build/minicalo*.so /usr/local/lib/python3.10/dist-packages/
RUN cp /root/minicalosim/bind/G4Calo.py \
RUN echo "commit = '${COMMIT}'" > /root/minicalosim/bind/minicalo_version.py && \
cp /root/minicalosim/bind/G4Calo.py \
/root/minicalosim/bind/minicalo_tools.py \
/root/minicalosim/bind/minipandas.py \
/root/minicalosim/bind/minicalo_version.py \
/usr/local/lib/python3.10/dist-packages/ && \
install -m 755 /root/minicalosim/bind/G4Calo_exec.py /usr/local/bin/G4Calo_exec.py