Skip to content
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

Jump to bottom

{phys}[GCC/13.2.0] Geant4 v11.3.0, Geant4-data v11.3, CLHEP v2.4.7.1 #22180

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

{phys}[GCC/13.2.0] Geant4 v11.3.0, Geant4-data v11.3, CLHEP v2.4.7.1 #22180

wants to merge 1 commit into from

Conversation

SimonPinches
Copy link
Contributor

(created using eb --new-pr)

@github-actions GitHub Actions
Copy link

Updated software CLHEP-2.4.7.1-GCC-13.2.0.eb

Diff against CLHEP-2.4.7.1-GCC-12.3.0.eb

easybuild/easyconfigs/c/CLHEP/CLHEP-2.4.7.1-GCC-12.3.0.eb

diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.4.7.1-GCC-12.3.0.eb b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.4.7.1-GCC-13.2.0.eb
index 4bf02eab9a..054dfb0676 100644
--- a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.4.7.1-GCC-12.3.0.eb
+++ b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.4.7.1-GCC-13.2.0.eb
@@ -8,7 +8,7 @@ description = """The CLHEP project is intended to be a set of HEP-specific found
  utility classes such as random generators, physics vectors, geometry and linear algebra.
  CLHEP is structured in a set of packages independent of any external package."""
 
-toolchain = {'name': 'GCC', 'version': '12.3.0'}
+toolchain = {'name': 'GCC', 'version': '13.2.0'}
 toolchainopts = {'pic': True}
 
 source_urls = ['https://proj-clhep.web.cern.ch/proj-clhep/dist1/']
@@ -16,7 +16,7 @@ sources = [SOURCELOWER_TGZ]
 checksums = ['1c8304a7772ac6b99195f1300378c6e3ddf4ad07c85d64a04505652abb8a55f9']
 
 builddependencies = [
-    ('CMake', '3.26.3'),
+    ('CMake', '3.27.6'),
 ]
 
 sanity_check_paths = {
Diff against CLHEP-2.4.6.2-GCC-11.3.0.eb

easybuild/easyconfigs/c/CLHEP/CLHEP-2.4.6.2-GCC-11.3.0.eb

diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.4.6.2-GCC-11.3.0.eb b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.4.7.1-GCC-13.2.0.eb
index f557d9b707..054dfb0676 100644
--- a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.4.6.2-GCC-11.3.0.eb
+++ b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.4.7.1-GCC-13.2.0.eb
@@ -1,22 +1,22 @@
 easyblock = 'CMakeMake'
 
 name = 'CLHEP'
-version = '2.4.6.2'
+version = '2.4.7.1'
 
 homepage = 'https://proj-clhep.web.cern.ch/proj-clhep/'
 description = """The CLHEP project is intended to be a set of HEP-specific foundation and
  utility classes such as random generators, physics vectors, geometry and linear algebra.
  CLHEP is structured in a set of packages independent of any external package."""
 
-toolchain = {'name': 'GCC', 'version': '11.3.0'}
+toolchain = {'name': 'GCC', 'version': '13.2.0'}
 toolchainopts = {'pic': True}
 
 source_urls = ['https://proj-clhep.web.cern.ch/proj-clhep/dist1/']
 sources = [SOURCELOWER_TGZ]
-checksums = ['aded73e49bac85a5b4e86f64a0ee3d6f3cfe5551b0f7731c78b6d8f9dac6e8dc']
+checksums = ['1c8304a7772ac6b99195f1300378c6e3ddf4ad07c85d64a04505652abb8a55f9']
 
 builddependencies = [
-    ('CMake', '3.24.3'),
+    ('CMake', '3.27.6'),
 ]
 
 sanity_check_paths = {
Diff against CLHEP-2.4.6.4-GCC-12.2.0.eb

easybuild/easyconfigs/c/CLHEP/CLHEP-2.4.6.4-GCC-12.2.0.eb

diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.4.6.4-GCC-12.2.0.eb b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.4.7.1-GCC-13.2.0.eb
index 1a08a4ed22..054dfb0676 100644
--- a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.4.6.4-GCC-12.2.0.eb
+++ b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.4.7.1-GCC-13.2.0.eb
@@ -1,21 +1,23 @@
 easyblock = 'CMakeMake'
 
 name = 'CLHEP'
-version = '2.4.6.4'
+version = '2.4.7.1'
 
 homepage = 'https://proj-clhep.web.cern.ch/proj-clhep/'
 description = """The CLHEP project is intended to be a set of HEP-specific foundation and
  utility classes such as random generators, physics vectors, geometry and linear algebra.
  CLHEP is structured in a set of packages independent of any external package."""
 
-toolchain = {'name': 'GCC', 'version': '12.2.0'}
+toolchain = {'name': 'GCC', 'version': '13.2.0'}
 toolchainopts = {'pic': True}
 
 source_urls = ['https://proj-clhep.web.cern.ch/proj-clhep/dist1/']
 sources = [SOURCELOWER_TGZ]
-checksums = ['49c89330f1903ef707d3c5d79c16a7c5a6f2c90fc290e2034ee3834809489e57']
+checksums = ['1c8304a7772ac6b99195f1300378c6e3ddf4ad07c85d64a04505652abb8a55f9']
 
-builddependencies = [('CMake', '3.24.3')]
+builddependencies = [
+    ('CMake', '3.27.6'),
+]
 
 sanity_check_paths = {
     'files': ['bin/clhep-config', 'lib/libCLHEP.a', 'lib/libCLHEP.%s' % SHLIB_EXT],

Updated software Geant4-data-11.3.eb

Diff against Geant4-data-11.2.eb

easybuild/easyconfigs/g/Geant4-data/Geant4-data-11.2.eb

diff --git a/easybuild/easyconfigs/g/Geant4-data/Geant4-data-11.2.eb b/easybuild/easyconfigs/g/Geant4-data/Geant4-data-11.3.eb
index a085843d7d..c979c49e78 100644
--- a/easybuild/easyconfigs/g/Geant4-data/Geant4-data-11.2.eb
+++ b/easybuild/easyconfigs/g/Geant4-data/Geant4-data-11.3.eb
@@ -1,6 +1,6 @@
 easyblock = 'Tarball'
 name = 'Geant4-data'
-version = '11.2'  # version should somewhat match the Geant4 version it should be used in
+version = '11.3'  # version should somewhat match the Geant4 version it should be used in
 
 homepage = 'https://geant4.web.cern.ch/'
 description = """Datasets for Geant4."""
@@ -12,34 +12,38 @@ toolchain = SYSTEM
 # see also https://github.com/Geant4/geant4/blob/v11.2.2/cmake/Modules/G4DatasetDefinitions.cmake
 local_datasets = [
     ('G4NDL', '4.7.1', 'G4NDL', 'G4NEUTRONHPDATA'),  # NDL
-    ('G4EMLOW', '8.5', 'G4EMLOW', 'G4LEDATA'),  # Low energy electromagnetics
-    ('PhotonEvaporation', '5.7', 'G4PhotonEvaporation', 'G4LEVELGAMMADATA'),  # Photon evaporation
-    ('RadioactiveDecay', '5.6', 'G4RadioactiveDecay', 'G4RADIOACTIVEDATA'),  # Radioisotopes
+    ('G4EMLOW', '8.6.1', 'G4EMLOW', 'G4LEDATA'),  # Low energy electromagnetics
+    ('PhotonEvaporation', '6.1', 'G4PhotonEvaporation', 'G4LEVELGAMMADATA'),  # Photon evaporation
+    ('RadioactiveDecay', '6.1.2', 'G4RadioactiveDecay', 'G4RADIOACTIVEDATA'),  # Radioisotopes
     ('G4SAIDDATA', '2.0', 'G4SAIDDATA', 'G4SAIDXSDATA'),  # SAID
-    ('G4PARTICLEXS', '4.0', 'G4PARTICLEXS', 'G4PARTICLEXSDATA'),  # Particle XS - replaces Neutron XS
+    ('G4PARTICLEXS', '4.1', 'G4PARTICLEXS', 'G4PARTICLEXSDATA'),  # Particle XS - replaces Neutron XS
     ('G4PII', '1.3', 'G4PII', 'G4PIIDATA'),  # PII
     ('RealSurface', '2.2', 'G4RealSurface', 'G4REALSURFACEDATA'),  # Optical Surfaces
     ('G4ABLA', '3.3', 'G4ABLA', 'G4ABLADATA'),  # ABLA
     ('G4INCL', '1.2', 'G4INCL', 'G4INCLDATA'),  # INCL
-    ('G4ENSDFSTATE', '2.3', 'G4ENSDFSTATE', 'G4ENSDFSTATEDATA'),  # ENSDFSTATE
+    ('G4ENSDFSTATE', '3.0', 'G4ENSDFSTATE', 'G4ENSDFSTATEDATA'),  # ENSDFSTATE
     ('G4TENDL', '1.4', 'G4TENDL', 'G4PARTICLEHPDATA'),  # TENDL
+    ('G4NUDEXLIB', '1.0', 'G4NUDEXLIB', 'G4NUDEXLIBDATA'),  # NuDEX
+    ('G4URRPT', '1.1', 'G4URRPT', 'G4URRPTDATA'),  # G4URRPT
 ]
 
 source_urls = ['https://cern.ch/geant4-data/datasets']
 sources = ['%s.%s.tar.gz' % (x[2], x[1]) for x in local_datasets]
 checksums = [
     {'G4NDL.4.7.1.tar.gz': 'd3acae48622118d2579de24a54d533fb2416bf0da9dd288f1724df1485a46c7c'},
-    {'G4EMLOW.8.5.tar.gz': '66baca49ac5d45e2ac10c125b4fb266225e511803e66981909ce9cd3e9bcef73'},
-    {'G4PhotonEvaporation.5.7.tar.gz': '761e42e56ffdde3d9839f9f9d8102607c6b4c0329151ee518206f4ee9e77e7e5'},
-    {'G4RadioactiveDecay.5.6.tar.gz': '3886077c9c8e5a98783e6718e1c32567899eeb2dbb33e402d4476bc2fe4f0df1'},
+    {'G4EMLOW.8.6.1.tar.gz': '4a93588d26080ce1d336b94f76fadabe4905fb8f1cba2415795023d6cd8f4a8a'},
+    {'G4PhotonEvaporation.6.1.tar.gz': '5ffc1f99a81d50c9020186d59874af73c53ba24c1842b3b82b3188223bb246f2'},
+    {'G4RadioactiveDecay.6.1.2.tar.gz': 'a40d7e3ebc64d35555c4a49d0ff1e0945cd605d84354d053121293914caea13a'},
     {'G4SAIDDATA.2.0.tar.gz': '1d26a8e79baa71e44d5759b9f55a67e8b7ede31751316a9e9037d80090c72e91'},
-    {'G4PARTICLEXS.4.0.tar.gz': '9381039703c3f2b0fd36ab4999362a2c8b4ff9080c322f90b4e319281133ca95'},
+    {'G4PARTICLEXS.4.1.tar.gz': '07ae1e048e9ac8e7f91f6696497dd55bd50ccc822d97af1a0b9e923212a6d7d1'},
     {'G4PII.1.3.tar.gz': '6225ad902675f4381c98c6ba25fc5a06ce87549aa979634d3d03491d6616e926'},
     {'G4RealSurface.2.2.tar.gz': '9954dee0012f5331267f783690e912e72db5bf52ea9babecd12ea22282176820'},
     {'G4ABLA.3.3.tar.gz': '1e041b3252ee9cef886d624f753e693303aa32d7e5ef3bba87b34f36d92ea2b1'},
     {'G4INCL.1.2.tar.gz': 'f880b16073ee0a92d7494f3276a6d52d4de1d3677a0d4c7c58700396ed0e1a7e'},
-    {'G4ENSDFSTATE.2.3.tar.gz': '9444c5e0820791abd3ccaace105b0e47790fadce286e11149834e79c4a8e9203'},
+    {'G4ENSDFSTATE.3.0.tar.gz': '4bdc3bd40b31d43485bf4f87f055705e540a6557d64ed85c689c59c9a4eba7d6'},
     {'G4TENDL.1.4.tar.gz': '4b7274020cc8b4ed569b892ef18c2e088edcdb6b66f39d25585ccee25d9721e0'},
+    {'G4NUDEXLIB.1.0.tar.gz': 'cac7d65e9c5af8edba2b2667d5822e16aaf99065c95f805e76de4cc86395f415'},
+    {'G4URRPT.1.1.tar.gz': '6a3432db80bc088aee19c504b9c0124913005d6357ea14870451400ab20d9c11'},
 ]
 
 start_dir = '..'
Diff against Geant4-data-11.1.eb

easybuild/easyconfigs/g/Geant4-data/Geant4-data-11.1.eb

diff --git a/easybuild/easyconfigs/g/Geant4-data/Geant4-data-11.1.eb b/easybuild/easyconfigs/g/Geant4-data/Geant4-data-11.3.eb
index 5f9812478e..c979c49e78 100644
--- a/easybuild/easyconfigs/g/Geant4-data/Geant4-data-11.1.eb
+++ b/easybuild/easyconfigs/g/Geant4-data/Geant4-data-11.3.eb
@@ -1,6 +1,6 @@
 easyblock = 'Tarball'
 name = 'Geant4-data'
-version = '11.1'  # version should somewhat match the Geant4 version it should be used in
+version = '11.3'  # version should somewhat match the Geant4 version it should be used in
 
 homepage = 'https://geant4.web.cern.ch/'
 description = """Datasets for Geant4."""
@@ -8,37 +8,42 @@ description = """Datasets for Geant4."""
 toolchain = SYSTEM
 
 # Pick up the correct sets and versions from cmake/Modules/G4DatasetDefinitions.cmake
-# in the Geant source
+# in the Geant source,
+# see also https://github.com/Geant4/geant4/blob/v11.2.2/cmake/Modules/G4DatasetDefinitions.cmake
 local_datasets = [
-    ('G4NDL', '4.7', 'G4NDL', 'G4NEUTRONHPDATA'),  # NDL
-    ('G4EMLOW', '8.2', 'G4EMLOW', 'G4LEDATA'),  # Low energy electromagnetics
-    ('PhotonEvaporation', '5.7', 'G4PhotonEvaporation', 'G4LEVELGAMMADATA'),  # Photon evaporation
-    ('RadioactiveDecay', '5.6', 'G4RadioactiveDecay', 'G4RADIOACTIVEDATA'),  # Radioisotopes
+    ('G4NDL', '4.7.1', 'G4NDL', 'G4NEUTRONHPDATA'),  # NDL
+    ('G4EMLOW', '8.6.1', 'G4EMLOW', 'G4LEDATA'),  # Low energy electromagnetics
+    ('PhotonEvaporation', '6.1', 'G4PhotonEvaporation', 'G4LEVELGAMMADATA'),  # Photon evaporation
+    ('RadioactiveDecay', '6.1.2', 'G4RadioactiveDecay', 'G4RADIOACTIVEDATA'),  # Radioisotopes
     ('G4SAIDDATA', '2.0', 'G4SAIDDATA', 'G4SAIDXSDATA'),  # SAID
-    ('G4PARTICLEXS', '4.0', 'G4PARTICLEXS', 'G4PARTICLEXSDATA'),  # Particle XS - replaces Neutron XS
+    ('G4PARTICLEXS', '4.1', 'G4PARTICLEXS', 'G4PARTICLEXSDATA'),  # Particle XS - replaces Neutron XS
     ('G4PII', '1.3', 'G4PII', 'G4PIIDATA'),  # PII
     ('RealSurface', '2.2', 'G4RealSurface', 'G4REALSURFACEDATA'),  # Optical Surfaces
-    ('G4ABLA', '3.1', 'G4ABLA', 'G4ABLADATA'),  # ABLA
-    ('G4INCL', '1.0', 'G4INCL', 'G4INCLDATA'),  # INCL
-    ('G4ENSDFSTATE', '2.3', 'G4ENSDFSTATE', 'G4ENSDFSTATEDATA'),  # ENSDFSTATE
+    ('G4ABLA', '3.3', 'G4ABLA', 'G4ABLADATA'),  # ABLA
+    ('G4INCL', '1.2', 'G4INCL', 'G4INCLDATA'),  # INCL
+    ('G4ENSDFSTATE', '3.0', 'G4ENSDFSTATE', 'G4ENSDFSTATEDATA'),  # ENSDFSTATE
     ('G4TENDL', '1.4', 'G4TENDL', 'G4PARTICLEHPDATA'),  # TENDL
+    ('G4NUDEXLIB', '1.0', 'G4NUDEXLIB', 'G4NUDEXLIBDATA'),  # NuDEX
+    ('G4URRPT', '1.1', 'G4URRPT', 'G4URRPTDATA'),  # G4URRPT
 ]
 
 source_urls = ['https://cern.ch/geant4-data/datasets']
 sources = ['%s.%s.tar.gz' % (x[2], x[1]) for x in local_datasets]
 checksums = [
-    {'G4NDL.4.7.tar.gz': '7e7d3d2621102dc614f753ad928730a290d19660eed96304a9d24b453d670309'},
-    {'G4EMLOW.8.2.tar.gz': '3d7768264ff5a53bcb96087604bbe11c60b7fea90aaac8f7d1252183e1a8e427'},
-    {'G4PhotonEvaporation.5.7.tar.gz': '761e42e56ffdde3d9839f9f9d8102607c6b4c0329151ee518206f4ee9e77e7e5'},
-    {'G4RadioactiveDecay.5.6.tar.gz': '3886077c9c8e5a98783e6718e1c32567899eeb2dbb33e402d4476bc2fe4f0df1'},
+    {'G4NDL.4.7.1.tar.gz': 'd3acae48622118d2579de24a54d533fb2416bf0da9dd288f1724df1485a46c7c'},
+    {'G4EMLOW.8.6.1.tar.gz': '4a93588d26080ce1d336b94f76fadabe4905fb8f1cba2415795023d6cd8f4a8a'},
+    {'G4PhotonEvaporation.6.1.tar.gz': '5ffc1f99a81d50c9020186d59874af73c53ba24c1842b3b82b3188223bb246f2'},
+    {'G4RadioactiveDecay.6.1.2.tar.gz': 'a40d7e3ebc64d35555c4a49d0ff1e0945cd605d84354d053121293914caea13a'},
     {'G4SAIDDATA.2.0.tar.gz': '1d26a8e79baa71e44d5759b9f55a67e8b7ede31751316a9e9037d80090c72e91'},
-    {'G4PARTICLEXS.4.0.tar.gz': '9381039703c3f2b0fd36ab4999362a2c8b4ff9080c322f90b4e319281133ca95'},
+    {'G4PARTICLEXS.4.1.tar.gz': '07ae1e048e9ac8e7f91f6696497dd55bd50ccc822d97af1a0b9e923212a6d7d1'},
     {'G4PII.1.3.tar.gz': '6225ad902675f4381c98c6ba25fc5a06ce87549aa979634d3d03491d6616e926'},
     {'G4RealSurface.2.2.tar.gz': '9954dee0012f5331267f783690e912e72db5bf52ea9babecd12ea22282176820'},
-    {'G4ABLA.3.1.tar.gz': '7698b052b58bf1b9886beacdbd6af607adc1e099fc730ab6b21cf7f090c027ed'},
-    {'G4INCL.1.0.tar.gz': '716161821ae9f3d0565fbf3c2cf34f4e02e3e519eb419a82236eef22c2c4367d'},
-    {'G4ENSDFSTATE.2.3.tar.gz': '9444c5e0820791abd3ccaace105b0e47790fadce286e11149834e79c4a8e9203'},
+    {'G4ABLA.3.3.tar.gz': '1e041b3252ee9cef886d624f753e693303aa32d7e5ef3bba87b34f36d92ea2b1'},
+    {'G4INCL.1.2.tar.gz': 'f880b16073ee0a92d7494f3276a6d52d4de1d3677a0d4c7c58700396ed0e1a7e'},
+    {'G4ENSDFSTATE.3.0.tar.gz': '4bdc3bd40b31d43485bf4f87f055705e540a6557d64ed85c689c59c9a4eba7d6'},
     {'G4TENDL.1.4.tar.gz': '4b7274020cc8b4ed569b892ef18c2e088edcdb6b66f39d25585ccee25d9721e0'},
+    {'G4NUDEXLIB.1.0.tar.gz': 'cac7d65e9c5af8edba2b2667d5822e16aaf99065c95f805e76de4cc86395f415'},
+    {'G4URRPT.1.1.tar.gz': '6a3432db80bc088aee19c504b9c0124913005d6357ea14870451400ab20d9c11'},
 ]
 
 start_dir = '..'
Diff against Geant4-data-20210510.eb

easybuild/easyconfigs/g/Geant4-data/Geant4-data-20210510.eb

diff --git a/easybuild/easyconfigs/g/Geant4-data/Geant4-data-20210510.eb b/easybuild/easyconfigs/g/Geant4-data/Geant4-data-11.3.eb
index 21a1b6c002..c979c49e78 100644
--- a/easybuild/easyconfigs/g/Geant4-data/Geant4-data-20210510.eb
+++ b/easybuild/easyconfigs/g/Geant4-data/Geant4-data-11.3.eb
@@ -1,38 +1,49 @@
 easyblock = 'Tarball'
 name = 'Geant4-data'
-version = '20210510'
+version = '11.3'  # version should somewhat match the Geant4 version it should be used in
 
-homepage = 'https://geant4.cern.ch/'
+homepage = 'https://geant4.web.cern.ch/'
 description = """Datasets for Geant4."""
 
 toolchain = SYSTEM
 
+# Pick up the correct sets and versions from cmake/Modules/G4DatasetDefinitions.cmake
+# in the Geant source,
+# see also https://github.com/Geant4/geant4/blob/v11.2.2/cmake/Modules/G4DatasetDefinitions.cmake
 local_datasets = [
-    ('G4NDL', '4.6', 'G4NDL', 'G4NEUTRONHPDATA'),  # NDL
-    ('G4EMLOW', '7.13', 'G4EMLOW', 'G4LEDATA'),  # Low energy electromagnetics
-    ('PhotonEvaporation', '5.7', 'G4PhotonEvaporation', 'G4LEVELGAMMADATA'),  # Photon evaporation
-    ('RadioactiveDecay', '5.6', 'G4RadioactiveDecay', 'G4RADIOACTIVEDATA'),  # Radioisotopes
+    ('G4NDL', '4.7.1', 'G4NDL', 'G4NEUTRONHPDATA'),  # NDL
+    ('G4EMLOW', '8.6.1', 'G4EMLOW', 'G4LEDATA'),  # Low energy electromagnetics
+    ('PhotonEvaporation', '6.1', 'G4PhotonEvaporation', 'G4LEVELGAMMADATA'),  # Photon evaporation
+    ('RadioactiveDecay', '6.1.2', 'G4RadioactiveDecay', 'G4RADIOACTIVEDATA'),  # Radioisotopes
     ('G4SAIDDATA', '2.0', 'G4SAIDDATA', 'G4SAIDXSDATA'),  # SAID
-    ('G4PARTICLEXS', '3.1.1', 'G4PARTICLEXS', 'G4PARTICLEXSDATA'),  # Particle XS - replaces Neutron XS
+    ('G4PARTICLEXS', '4.1', 'G4PARTICLEXS', 'G4PARTICLEXSDATA'),  # Particle XS - replaces Neutron XS
     ('G4PII', '1.3', 'G4PII', 'G4PIIDATA'),  # PII
     ('RealSurface', '2.2', 'G4RealSurface', 'G4REALSURFACEDATA'),  # Optical Surfaces
-    ('G4INCL', '1.0', 'G4INCL', 'G4INCLDATA'),  # INCL
-    ('G4ENSDFSTATE', '2.3', 'G4ENSDFSTATE', 'G4ENSDFSTATEDATA'),  # ENSDFSTATE
+    ('G4ABLA', '3.3', 'G4ABLA', 'G4ABLADATA'),  # ABLA
+    ('G4INCL', '1.2', 'G4INCL', 'G4INCLDATA'),  # INCL
+    ('G4ENSDFSTATE', '3.0', 'G4ENSDFSTATE', 'G4ENSDFSTATEDATA'),  # ENSDFSTATE
+    ('G4TENDL', '1.4', 'G4TENDL', 'G4PARTICLEHPDATA'),  # TENDL
+    ('G4NUDEXLIB', '1.0', 'G4NUDEXLIB', 'G4NUDEXLIBDATA'),  # NuDEX
+    ('G4URRPT', '1.1', 'G4URRPT', 'G4URRPTDATA'),  # G4URRPT
 ]
 
 source_urls = ['https://cern.ch/geant4-data/datasets']
 sources = ['%s.%s.tar.gz' % (x[2], x[1]) for x in local_datasets]
 checksums = [
-    '9d287cf2ae0fb887a2adce801ee74fb9be21b0d166dab49bcbee9408a5145408',  # G4NDL.4.6.tar.gz
-    '374896b649be776c6c10fea80abe6cf32f9136df0b6ab7c7236d571d49fb8c69',  # G4EMLOW.7.13.tar.gz
-    '761e42e56ffdde3d9839f9f9d8102607c6b4c0329151ee518206f4ee9e77e7e5',  # G4PhotonEvaporation.5.7.tar.gz
-    '3886077c9c8e5a98783e6718e1c32567899eeb2dbb33e402d4476bc2fe4f0df1',  # G4RadioactiveDecay.5.6.tar.gz
-    '1d26a8e79baa71e44d5759b9f55a67e8b7ede31751316a9e9037d80090c72e91',  # G4SAIDDATA.2.0.tar.gz
-    '66c17edd6cb6967375d0497add84c2201907a25e33db782ebc26051d38f2afda',  # G4PARTICLEXS.3.1.1.tar.gz
-    '6225ad902675f4381c98c6ba25fc5a06ce87549aa979634d3d03491d6616e926',  # G4PII.1.3.tar.gz
-    '9954dee0012f5331267f783690e912e72db5bf52ea9babecd12ea22282176820',  # G4RealSurface.2.2.tar.gz
-    '716161821ae9f3d0565fbf3c2cf34f4e02e3e519eb419a82236eef22c2c4367d',  # G4INCL.1.0.tar.gz
-    '9444c5e0820791abd3ccaace105b0e47790fadce286e11149834e79c4a8e9203',  # G4ENSDFSTATE.2.3.tar.gz
+    {'G4NDL.4.7.1.tar.gz': 'd3acae48622118d2579de24a54d533fb2416bf0da9dd288f1724df1485a46c7c'},
+    {'G4EMLOW.8.6.1.tar.gz': '4a93588d26080ce1d336b94f76fadabe4905fb8f1cba2415795023d6cd8f4a8a'},
+    {'G4PhotonEvaporation.6.1.tar.gz': '5ffc1f99a81d50c9020186d59874af73c53ba24c1842b3b82b3188223bb246f2'},
+    {'G4RadioactiveDecay.6.1.2.tar.gz': 'a40d7e3ebc64d35555c4a49d0ff1e0945cd605d84354d053121293914caea13a'},
+    {'G4SAIDDATA.2.0.tar.gz': '1d26a8e79baa71e44d5759b9f55a67e8b7ede31751316a9e9037d80090c72e91'},
+    {'G4PARTICLEXS.4.1.tar.gz': '07ae1e048e9ac8e7f91f6696497dd55bd50ccc822d97af1a0b9e923212a6d7d1'},
+    {'G4PII.1.3.tar.gz': '6225ad902675f4381c98c6ba25fc5a06ce87549aa979634d3d03491d6616e926'},
+    {'G4RealSurface.2.2.tar.gz': '9954dee0012f5331267f783690e912e72db5bf52ea9babecd12ea22282176820'},
+    {'G4ABLA.3.3.tar.gz': '1e041b3252ee9cef886d624f753e693303aa32d7e5ef3bba87b34f36d92ea2b1'},
+    {'G4INCL.1.2.tar.gz': 'f880b16073ee0a92d7494f3276a6d52d4de1d3677a0d4c7c58700396ed0e1a7e'},
+    {'G4ENSDFSTATE.3.0.tar.gz': '4bdc3bd40b31d43485bf4f87f055705e540a6557d64ed85c689c59c9a4eba7d6'},
+    {'G4TENDL.1.4.tar.gz': '4b7274020cc8b4ed569b892ef18c2e088edcdb6b66f39d25585ccee25d9721e0'},
+    {'G4NUDEXLIB.1.0.tar.gz': 'cac7d65e9c5af8edba2b2667d5822e16aaf99065c95f805e76de4cc86395f415'},
+    {'G4URRPT.1.1.tar.gz': '6a3432db80bc088aee19c504b9c0124913005d6357ea14870451400ab20d9c11'},
 ]
 
 start_dir = '..'

Updated software Geant4-11.3.0-GCC-13.2.0.eb

Diff against Geant4-11.2.2-GCC-12.3.0.eb

easybuild/easyconfigs/g/Geant4/Geant4-11.2.2-GCC-12.3.0.eb

diff --git a/easybuild/easyconfigs/g/Geant4/Geant4-11.2.2-GCC-12.3.0.eb b/easybuild/easyconfigs/g/Geant4/Geant4-11.3.0-GCC-13.2.0.eb
index d4cdf6c78c..b12595f6ed 100644
--- a/easybuild/easyconfigs/g/Geant4/Geant4-11.2.2-GCC-12.3.0.eb
+++ b/easybuild/easyconfigs/g/Geant4/Geant4-11.3.0-GCC-13.2.0.eb
@@ -1,12 +1,12 @@
 name = 'Geant4'
-version = '11.2.2'
+version = '11.3.0'
 
 homepage = 'https://geant4.web.cern.ch/'
 description = """Geant4 is a toolkit for the simulation of the passage of particles through matter.
  Its areas of application include high energy, nuclear and accelerator physics,
  as well as studies in medical and space science."""
 
-toolchain = {'name': 'GCC', 'version': '12.3.0'}
+toolchain = {'name': 'GCC', 'version': '13.2.0'}
 
 github_account = 'Geant4'
 source_urls = [GITHUB_SOURCE]
@@ -15,22 +15,22 @@ patches = [
     'Geant4-11.1.2_use_data_env_vars_from_Geant4-data_module.patch',
 ]
 checksums = [
-    {'geant4-11.2.2.tar.gz': '0b0cfce14e9143079c4440d27ee21f889c4c4172ac5ee7586746b940ffcf812a'},
+    {'geant4-11.3.0.tar.gz': 'a98340e3015d2e69ae956aa29d33dfc43c8cb3e0561ee2530b76dc1c79cd8698'},
     {'Geant4-11.1.2_use_data_env_vars_from_Geant4-data_module.patch':
      '822265b7cbcaacdffd28b1094786a3c94122aff63338e514d5d3810cdf9218a6'},
 ]
 
 builddependencies = [
-    ('CMake', '3.26.3'),
+    ('CMake', '3.27.6'),
 ]
 
 dependencies = [
     ('expat', '2.5.0'),
-    # recommended CLHEP version, see https://geant4.web.cern.ch/download/release-notes/notes-v11.1.0.html
+    # recommended CLHEP version, see https://geant4.web.cern.ch/download/release-notes/notes-v11.3.0.html
     ('CLHEP', '2.4.7.1'),
-    ('Xerces-C++', '3.2.4'),
-    ('Qt5', '5.15.10'),
-    ('Geant4-data', '11.2', '', SYSTEM),
+    ('Xerces-C++', '3.2.5'),
+    ('Qt6', '6.6.3'),
+    ('Geant4-data', '11.3', '', SYSTEM),
 ]
 
 _copts = [
@@ -39,6 +39,7 @@ _copts = [
     "-DGEANT4_USE_SYSTEM_EXPAT=ON",
     "-DGEANT4_USE_SYSTEM_CLHEP=ON",
     "-DGEANT4_USE_QT=ON",
+    "-DGEANT4_USE_QT_QT6=ON",
     "-DGEANT4_USE_GDML=ON",
     "-DGEANT4_USE_OPENGL_X11=ON",
     "-DGEANT4_USE_RAYTRACER_X11=ON",
Diff against Geant4-11.1.2-GCC-11.3.0.eb

easybuild/easyconfigs/g/Geant4/Geant4-11.1.2-GCC-11.3.0.eb

diff --git a/easybuild/easyconfigs/g/Geant4/Geant4-11.1.2-GCC-11.3.0.eb b/easybuild/easyconfigs/g/Geant4/Geant4-11.3.0-GCC-13.2.0.eb
index d535658d41..b12595f6ed 100644
--- a/easybuild/easyconfigs/g/Geant4/Geant4-11.1.2-GCC-11.3.0.eb
+++ b/easybuild/easyconfigs/g/Geant4/Geant4-11.3.0-GCC-13.2.0.eb
@@ -1,12 +1,12 @@
 name = 'Geant4'
-version = '11.1.2'
+version = '11.3.0'
 
 homepage = 'https://geant4.web.cern.ch/'
 description = """Geant4 is a toolkit for the simulation of the passage of particles through matter.
  Its areas of application include high energy, nuclear and accelerator physics,
  as well as studies in medical and space science."""
 
-toolchain = {'name': 'GCC', 'version': '11.3.0'}
+toolchain = {'name': 'GCC', 'version': '13.2.0'}
 
 github_account = 'Geant4'
 source_urls = [GITHUB_SOURCE]
@@ -15,22 +15,22 @@ patches = [
     'Geant4-11.1.2_use_data_env_vars_from_Geant4-data_module.patch',
 ]
 checksums = [
-    {'geant4-11.1.2.tar.gz': 'b0d0ca79188f85e5a6a178cf8e5ebde16cfeb30959f8862517daab60e0ae2691'},
+    {'geant4-11.3.0.tar.gz': 'a98340e3015d2e69ae956aa29d33dfc43c8cb3e0561ee2530b76dc1c79cd8698'},
     {'Geant4-11.1.2_use_data_env_vars_from_Geant4-data_module.patch':
      '822265b7cbcaacdffd28b1094786a3c94122aff63338e514d5d3810cdf9218a6'},
 ]
 
 builddependencies = [
-    ('CMake', '3.24.3'),
+    ('CMake', '3.27.6'),
 ]
 
 dependencies = [
-    ('expat', '2.4.8'),
-    # recommended CLHEP version, see https://geant4.web.cern.ch/download/release-notes/notes-v11.1.0.html
-    ('CLHEP', '2.4.6.2'),
-    ('Xerces-C++', '3.2.4'),
-    ('Qt5', '5.15.5'),
-    ('Geant4-data', '11.1', '', SYSTEM),
+    ('expat', '2.5.0'),
+    # recommended CLHEP version, see https://geant4.web.cern.ch/download/release-notes/notes-v11.3.0.html
+    ('CLHEP', '2.4.7.1'),
+    ('Xerces-C++', '3.2.5'),
+    ('Qt6', '6.6.3'),
+    ('Geant4-data', '11.3', '', SYSTEM),
 ]
 
 _copts = [
@@ -39,6 +39,7 @@ _copts = [
     "-DGEANT4_USE_SYSTEM_EXPAT=ON",
     "-DGEANT4_USE_SYSTEM_CLHEP=ON",
     "-DGEANT4_USE_QT=ON",
+    "-DGEANT4_USE_QT_QT6=ON",
     "-DGEANT4_USE_GDML=ON",
     "-DGEANT4_USE_OPENGL_X11=ON",
     "-DGEANT4_USE_RAYTRACER_X11=ON",
Diff against Geant4-11.0.2-GCC-11.3.0.eb

easybuild/easyconfigs/g/Geant4/Geant4-11.0.2-GCC-11.3.0.eb

diff --git a/easybuild/easyconfigs/g/Geant4/Geant4-11.0.2-GCC-11.3.0.eb b/easybuild/easyconfigs/g/Geant4/Geant4-11.3.0-GCC-13.2.0.eb
index 7fe2129d33..b12595f6ed 100644
--- a/easybuild/easyconfigs/g/Geant4/Geant4-11.0.2-GCC-11.3.0.eb
+++ b/easybuild/easyconfigs/g/Geant4/Geant4-11.3.0-GCC-13.2.0.eb
@@ -1,27 +1,49 @@
 name = 'Geant4'
-version = '11.0.2'
+version = '11.3.0'
 
-homepage = 'https://geant4.cern.ch/'
+homepage = 'https://geant4.web.cern.ch/'
 description = """Geant4 is a toolkit for the simulation of the passage of particles through matter.
  Its areas of application include high energy, nuclear and accelerator physics,
  as well as studies in medical and space science."""
 
-toolchain = {'name': 'GCC', 'version': '11.3.0'}
+toolchain = {'name': 'GCC', 'version': '13.2.0'}
 
 github_account = 'Geant4'
 source_urls = [GITHUB_SOURCE]
 sources = [{'download_filename': 'v%(version)s.tar.gz', 'filename': SOURCELOWER_TAR_GZ}]
-checksums = ['ddabe8d5cc3bd465c969f375cc43ee537ff33c17dc2943b8a4420cfa83cfcfcc']
+patches = [
+    'Geant4-11.1.2_use_data_env_vars_from_Geant4-data_module.patch',
+]
+checksums = [
+    {'geant4-11.3.0.tar.gz': 'a98340e3015d2e69ae956aa29d33dfc43c8cb3e0561ee2530b76dc1c79cd8698'},
+    {'Geant4-11.1.2_use_data_env_vars_from_Geant4-data_module.patch':
+     '822265b7cbcaacdffd28b1094786a3c94122aff63338e514d5d3810cdf9218a6'},
+]
+
+builddependencies = [
+    ('CMake', '3.27.6'),
+]
 
-builddependencies = [('CMake', '3.23.1')]
 dependencies = [
-    ('expat', '2.4.8'),
-    # (bugfix update of) recommended CLHEP version,
-    # see https://geant4-data.web.cern.ch/ReleaseNotes/ReleaseNotes.11.0.html
-    ('CLHEP', '2.4.5.3'),
+    ('expat', '2.5.0'),
+    # recommended CLHEP version, see https://geant4.web.cern.ch/download/release-notes/notes-v11.3.0.html
+    ('CLHEP', '2.4.7.1'),
+    ('Xerces-C++', '3.2.5'),
+    ('Qt6', '6.6.3'),
+    ('Geant4-data', '11.3', '', SYSTEM),
 ]
 
-configopts = "-DEXPAT_LIBRARY=$EBROOTEXPAT/lib/libexpat.so -DEXPAT_INCLUDE_DIR=$EBROOTEXPAT/include"
-configopts += " -DCLHEP_ROOT_DIR=$EBROOTCLHEP -DGEANT4_INSTALL_DATA=OFF"
+_copts = [
+    "-DGEANT4_INSTALL_DATA=OFF",
+    "-DGEANT4_USE_SYSTEM_ZLIB=ON",
+    "-DGEANT4_USE_SYSTEM_EXPAT=ON",
+    "-DGEANT4_USE_SYSTEM_CLHEP=ON",
+    "-DGEANT4_USE_QT=ON",
+    "-DGEANT4_USE_QT_QT6=ON",
+    "-DGEANT4_USE_GDML=ON",
+    "-DGEANT4_USE_OPENGL_X11=ON",
+    "-DGEANT4_USE_RAYTRACER_X11=ON",
+]
+configopts = ' '.join(_copts)
 
 moduleclass = 'phys'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
update
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@SimonPinches