Skip to content

Commit 35da1ef

Browse files
committed
Move to Geant4 11.4.3
1 parent 405e15b commit 35da1ef

2 files changed

Lines changed: 14 additions & 16 deletions

File tree

‎Dockerfile‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ ENV CLING_STANDARD_PCH=none
186186
# Assumptions
187187
# - GEANT4 defined to be a release of geant4 or LDMX's fork of geant4
188188
###############################################################################
189-
ENV GEANT4=LDMX.10.2.3_v0.6
189+
ENV GEANT4=LDMX.11.4.3_v1
190190
ENV G4DATADIR="${__prefix}/share/geant4/data"
191191
LABEL geant4.version="${GEANT4}"
192192
RUN __owner="geant4" &&\
@@ -200,28 +200,26 @@ RUN __owner="geant4" &&\
200200
-DGEANT4_INSTALL_EXAMPLES=OFF \
201201
-DGEANT4_USE_OPENGL_X11=ON \
202202
-DGEANT4_USE_SYSTEM_ZLIB=ON \
203+
-DGEANT4_BUILD_MULTITHREADED=OFF \
203204
-DCMAKE_INSTALL_PREFIX=${__prefix} \
204-
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
205-
-DCMAKE_C_COMPILER=gcc-13 \
206-
-DCMAKE_CXX_COMPILER=g++-13 \
207205
-B src/build \
208206
-S src \
209207
&&\
210208
cmake --build src/build --target install -j$NPROC &&\
211209
rm -rf src
212210

213-
ENV G4NEUTRONHPDATA="${G4DATADIR}/G4NDL4.5"
214-
ENV G4LEDATA="${G4DATADIR}/G4EMLOW6.48"
215-
ENV G4LEVELGAMMADATA="${G4DATADIR}/PhotonEvaporation3.2"
216-
ENV G4RADIOACTIVEDATA="${G4DATADIR}/RadioactiveDecay4.3.2"
217-
ENV G4PARTICLEXSDATA="${G4DATADIR}/G4PARTICLEXS3.1.1"
211+
ENV G4NEUTRONHPDATA="${G4DATADIR}/G4NDL4.7.1"
212+
ENV G4LEDATA="${G4DATADIR}/G4EMLOW8.8"
213+
ENV G4LEVELGAMMADATA="${G4DATADIR}/PhotonEvaporation6.1.2"
214+
ENV G4RADIOACTIVEDATA="${G4DATADIR}/RadioactiveDecay6.1.2"
215+
ENV G4PARTICLEXSDATA="${G4DATADIR}/G4PARTICLEXS4.2"
218216
ENV G4PIIDATA="${G4DATADIR}/G4PII1.3"
219-
ENV G4REALSURFACEDATA="${G4DATADIR}/RealSurface1.0"
220-
ENV G4SAIDXSDATA="${G4DATADIR}/G4SAIDDATA1.1"
221-
ENV G4ABLADATA="${G4DATADIR}/G4ABLA3.0"
222-
ENV G4INCLDATA="${G4DATADIR}/G4INCL1.0"
223-
ENV G4ENSDFSTATEDATA="${G4DATADIR}/G4ENSDFSTATE1.2.3"
224-
ENV G4NEUTRONXSDATA="${G4DATADIR}/G4NEUTRONXS1.4"
217+
ENV G4REALSURFACEDATA="${G4DATADIR}/RealSurface2.2"
218+
ENV G4SAIDXSDATA="${G4DATADIR}/G4SAIDDATA2.0"
219+
ENV G4ABLADATA="${G4DATADIR}/G4ABLA3.3"
220+
ENV G4INCLDATA="${G4DATADIR}/G4INCL1.3"
221+
ENV G4ENSDFSTATEDATA="${G4DATADIR}/G4ENSDFSTATE3.0"
222+
ENV G4CHANNELINGDATA="${G4DATADIR}/G4CHANNELING2.0"
225223

226224
################################################################################
227225
# Install Eigen headers into container

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Software Package | Version | Construction Process
4747
[Pythia8](https://pythia.org/) | 8.313 | Built from source
4848
[nlohmann/json](https://json.nlohmann.me/) | 3.11.3 | From Ubuntu Repos
4949
[ROOT](https://root.cern.ch/) | 6.38.04 | Built from source
50-
[Geant4](https://geant4.web.cern.ch/) | [LDMX.10.2.3\_v0.6](https://github.com/LDMX-Software/geant4/tree/LDMX.10.2.3_v0.6) | Built from source
50+
[Geant4](https://geant4.web.cern.ch/) | [LDMX.11.4.3\_v1](https://github.com/LDMX-Software/geant4/tree/LDMX.11.4.3_v1) | Built from source
5151
[Eigen](https://eigen.tuxfamily.org) | 3.4.0 | Built from source
5252
[HEPMC3](https://hepmc.web.cern.ch) | 3.3.0 | Built from source
5353
[GENIE](http://www.genie-mc.org/) Generator | [3.04.02-ldmx](https://github.com/wesketchum/Generator/releases/tag/R-3_04_02-ldmx) | Built from source

0 commit comments

Comments
 (0)