diff --git a/.github/workflows/Dockerfile_opengate_core b/.github/workflows/Dockerfile_opengate_core index 1ec506858..d6bca126d 100644 --- a/.github/workflows/Dockerfile_opengate_core +++ b/.github/workflows/Dockerfile_opengate_core @@ -24,7 +24,7 @@ RUN yum install -y gcc wget git expat-devel fftw-devel qt6-qtbase-devel free #Compile Geant4 && cd /software/geant4 \ - && git clone --branch v11.4.0 https://github.com/Geant4/geant4.git --depth 1 src \ + && git clone --branch v11.4.2 https://github.com/Geant4/geant4.git --depth 1 src \ && cd bin \ && . /opt/rh/gcc-toolset-14/enable \ && cmake -DCMAKE_CXX_FLAGS=-std=c++17 -DGEANT4_BUILD_MULTITHREADED=ON -DGEANT4_USE_GDML=ON -DGEANT4_INSTALL_DATA=OFF -DGEANT4_USE_QT=ON -DGEANT4_USE_OPENGL_X11=ON -DGEANT4_USE_QT_QT6=ON -DGEANT4_BUILD_TLS_MODEL=global-dynamic ../src \ diff --git a/.github/workflows/Dockerfile_opengate_core_arm64 b/.github/workflows/Dockerfile_opengate_core_arm64 index 31b927b27..e0e41a22e 100644 --- a/.github/workflows/Dockerfile_opengate_core_arm64 +++ b/.github/workflows/Dockerfile_opengate_core_arm64 @@ -27,7 +27,7 @@ RUN yum install -y gcc wget git expat-devel fftw-devel qt6-qtbase-devel free #Compile Geant4 && cd /software/geant4 \ - && git clone --branch v11.4.0 https://github.com/Geant4/geant4.git --depth 1 src \ + && git clone --branch v11.4.2 https://github.com/Geant4/geant4.git --depth 1 src \ && cd bin \ && . /opt/rh/gcc-toolset-14/enable \ && cmake -DCMAKE_CXX_FLAGS=-std=c++17 -DGEANT4_BUILD_MULTITHREADED=ON -DGEANT4_USE_GDML=ON -DGEANT4_INSTALL_DATA=OFF -DGEANT4_USE_QT=ON -DGEANT4_USE_OPENGL_X11=ON -DGEANT4_USE_QT_QT6=ON -DGEANT4_BUILD_TLS_MODEL=global-dynamic ../src \ diff --git a/.github/workflows/Dockerfile_opengate_core_novis b/.github/workflows/Dockerfile_opengate_core_novis index 1fb28f017..6b84f15bd 100644 --- a/.github/workflows/Dockerfile_opengate_core_novis +++ b/.github/workflows/Dockerfile_opengate_core_novis @@ -24,7 +24,7 @@ RUN yum install -y gcc wget git expat-devel fftw-devel freeglut-devel libXmu #Compile Geant4 && cd /software/geant4 \ - && git clone --branch v11.4.0 https://github.com/Geant4/geant4.git --depth 1 src \ + && git clone --branch v11.4.2 https://github.com/Geant4/geant4.git --depth 1 src \ && cd bin \ && cmake -DCMAKE_CXX_FLAGS=-std=c++17 -DGEANT4_BUILD_MULTITHREADED=ON -DGEANT4_USE_GDML=OFF -DGEANT4_INSTALL_DATA=OFF -DGEANT4_USE_QT=OFF -DGEANT4_USE_OPENGL_X11=OFF -DGEANT4_BUILD_TLS_MODEL=global-dynamic ../src \ && make -j10 \ diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9404ca9dc..3832041b8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ concurrency: cancel-in-progress: ${{ github.event_name == 'pull_request' }} env: - GEANT4_VERSION: 'v11.4.0' + GEANT4_VERSION: 'v11.4.2' ITK_VERSION: 'v5.4.4' jobs: @@ -234,7 +234,7 @@ jobs: # ssh_session: # env: -# GEANT4_VERSION: 'v11.4.0' +# GEANT4_VERSION: 'v11.4.2' # ITK_VERSION: 'v5.4.4' # runs-on: macos-13 # steps: diff --git a/opengate/tests/src/actors/test037_pet_hits_singles_1.py b/opengate/tests/src/actors/test037_pet_hits_singles_1.py index 910a919a7..04d8e0c29 100755 --- a/opengate/tests/src/actors/test037_pet_hits_singles_1.py +++ b/opengate/tests/src/actors/test037_pet_hits_singles_1.py @@ -53,7 +53,7 @@ gate.exception.warning(f"Check stats") p = paths.gate / "output" stats_ref = utility.read_stats_file(p / "stats1.txt") - is_ok = utility.assert_stats(stats, stats_ref, [0.028, 0.028, 0.053]) + is_ok = utility.assert_stats(stats, stats_ref, [0.028, 0.028, 0.058]) # check root hits hc = sim.get_actor("Hits") diff --git a/opengate/tests/src/physics/test013_phys_lists_4.py b/opengate/tests/src/physics/test013_phys_lists_4.py index d725c5ac9..1688b1758 100755 --- a/opengate/tests/src/physics/test013_phys_lists_4.py +++ b/opengate/tests/src/physics/test013_phys_lists_4.py @@ -56,6 +56,6 @@ print("Reference file", f) stats_ref = utility.read_stats_file(f) print(stats_ref) - is_ok = utility.assert_stats(stats, stats_ref, tolerance=[0.12, 0.12, 0.16]) + is_ok = utility.assert_stats(stats, stats_ref, tolerance=[0.12, 0.12, 0.19]) utility.test_ok(is_ok)