Skip to content

Commit c8f685f

Browse files
Update to Geant4 version 11.4.0
1 parent 1e6181b commit c8f685f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+832
-1421
lines changed

.github/workflows/tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- main
99

1010
env:
11-
GEANT4_GIT_TAG: v11.3.2
11+
GEANT4_GIT_TAG: v11.4.0
1212
GEANT4_SOURCE_DIR: geant4_source
1313
GEANT4_BUILD_DIR: geant4_build
1414
GEANT4_INSTALL_DIR: geant4_install
@@ -26,7 +26,7 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
os: [windows-latest, macos-latest, ubuntu-latest]
29-
python-version: ["3.9", "3.13"]
29+
python-version: ["3.9", "3.14"]
3030
exclude:
3131
- os: macos-latest
3232
python-version: "3.9"
@@ -48,14 +48,14 @@ jobs:
4848
path: ${{ github.workspace }}/${{ env.XERCES_C_INSTALL_DIR }}
4949
key: ${{ env.XERCES_C_GIT_REF }}
5050

51-
- uses: actions/checkout@v4
51+
- uses: actions/checkout@v5
5252
if: steps.g4cache.outputs.cache-hit != 'true'
5353
with:
5454
repository: Geant4/geant4
5555
ref: ${{ env.GEANT4_GIT_TAG }}
5656
path: ${{ env.GEANT4_SOURCE_DIR }}
5757

58-
- uses: actions/checkout@v4
58+
- uses: actions/checkout@v5
5959
if: steps.xerces-cache.outputs.cache-hit != 'true'
6060
with:
6161
repository: apache/xerces-c
@@ -142,7 +142,7 @@ jobs:
142142
echo "CMAKE_ARGS=-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded" >> $GITHUB_ENV
143143
echo "CMAKE_PREFIX_PATH=${{ github.workspace }}/${{ env.XERCES_C_INSTALL_DIR }}" >> $GITHUB_ENV
144144
145-
- uses: actions/checkout@v4
145+
- uses: actions/checkout@v5
146146
with:
147147
submodules: true
148148
path: ${{ github.event.repository.name }}

.github/workflows/wheels.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- published
88

99
env:
10-
GEANT4_GIT_TAG: v11.3.2
10+
GEANT4_GIT_TAG: v11.4.0
1111
GEANT4_SOURCE_DIR: geant4_source
1212
GEANT4_BUILD_DIR: geant4_build
1313
GEANT4_INSTALL_DIR: geant4_install
@@ -22,7 +22,7 @@ jobs:
2222
name: Build SDist
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
with:
2727
submodules: true
2828

@@ -53,7 +53,7 @@ jobs:
5353
]
5454

5555
steps:
56-
- uses: actions/checkout@v4
56+
- uses: actions/checkout@v5
5757
with:
5858
submodules: true
5959

@@ -73,7 +73,7 @@ jobs:
7373
path: ${{ github.workspace }}/${{ env.GEANT4_INSTALL_DIR }}
7474
key: ${{ env.GEANT4_GIT_TAG }}-${{ env.XERCES_C_GIT_REF }}
7575

76-
- uses: actions/checkout@v4
76+
- uses: actions/checkout@v5
7777
if: runner.os == 'Windows' && steps.xerces-cache.outputs.cache-hit != 'true'
7878
with:
7979
repository: apache/xerces-c
@@ -95,7 +95,7 @@ jobs:
9595
cmake --build "${{ github.workspace }}/${{ env.XERCES_C_BUILD_DIR }}" --config Release &&
9696
cmake --build "${{ github.workspace }}/${{ env.XERCES_C_BUILD_DIR }}" --config Release --target install
9797
98-
- uses: actions/checkout@v4
98+
- uses: actions/checkout@v5
9999
if: runner.os == 'Windows' && steps.g4cache.outputs.cache-hit != 'true'
100100
with:
101101
repository: Geant4/geant4
@@ -154,7 +154,7 @@ jobs:
154154
path: ${{ github.workspace }}/.geant4_pybind
155155
enableCrossOsArchive: true
156156

157-
- uses: pypa/cibuildwheel@v2.22.0
157+
- uses: pypa/cibuildwheel@v3.3.0
158158
env:
159159
CIBW_ENVIRONMENT_LINUX: CXXFLAGS='-fPIC' CFLAGS='-fPIC'
160160
CIBW_BEFORE_ALL_LINUX: >
@@ -246,6 +246,7 @@ jobs:
246246
CIBW_BEFORE_BUILD: rm -rf {project}/build
247247
CIBW_TEST_COMMAND_MACOS: HOME={package} python {package}/tests/test_B1.py
248248
CIBW_TEST_COMMAND_WINDOWS: python {package}/tests/test_B1.py
249+
CIBW_ENABLE: pypy
249250

250251
- uses: actions/upload-artifact@v4
251252
with:

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ find_package(Geant4 11.0 REQUIRED)
1919
find_package(Geant4 OPTIONAL_COMPONENTS gdml ui_tcsh motif vis_raytracer_x11 vis_opengl_x11 vis_opengl_win32 qt)
2020

2121
set(PYBIND11_PYTHON_VERSION 3.5)
22+
set(PYBIND11_FINDPYTHON ON)
2223
add_subdirectory(pybind11)
2324

2425
add_subdirectory(source)

examples/B1/exampleB1.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
/gun/particle gamma
77
/gun/energy 6 MeV
88
#
9-
/run/printProgress 100
10-
/run/beamOn 1000
9+
/run/printProgress 1000
10+
/run/beamOn 10000
1111
#
1212
# proton 210 MeV
1313
/gun/particle proton
1414
/gun/energy 210 MeV
1515
#
16-
/run/beamOn 1000
16+
/run/beamOn 10000

0 commit comments

Comments
 (0)