Skip to content

Commit 12dd120

Browse files
wdconincdrbenmorgansethrj
authored
geant4: add v11.3.0 (spack#47961)
* geant4: add v11.3.0 * geant4: rm deprecated 11.3.0.beta * geant4: add 11.3.0 and associated data library versions - Data library versions taken from: - https://gitlab.cern.ch/geant4/geant4/-/blob/v11.3.0/cmake/Modules/G4DatasetDefinitions.cmake?ref_type=tags - Variants etc otherwise unchanged. - 11.3.0-beta version removed, release version marked as preffered. * g4channeling: f-strings --------- Co-authored-by: Ben Morgan <[email protected]> Co-authored-by: Seth R. Johnson <[email protected]>
1 parent 728c5e0 commit 12dd120

File tree

8 files changed

+51
-15
lines changed

8 files changed

+51
-15
lines changed
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
2+
# Spack Project Developers. See the top-level COPYRIGHT file for details.
3+
#
4+
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
5+
6+
7+
from spack.package import *
8+
9+
10+
class G4channeling(Package):
11+
"""Geant4 data for solid state crystal channeling"""
12+
13+
homepage = "https://geant4.web.cern.ch"
14+
url = "https://geant4-data.web.cern.ch/geant4-data/datasets/G4CHANNELING.1.0.tar.gz"
15+
16+
tags = ["hep"]
17+
18+
maintainers("drbenmorgan")
19+
20+
# Only versions relevant to Geant4 releases built by spack are added
21+
version("1.0", sha256="203e3c69984ca09acd181a1d31a9b0efafad4bc12e6c608f0b05e695120d67f2")
22+
23+
def install(self, spec, prefix):
24+
mkdirp(join_path(prefix.share, "data"))
25+
install_path = join_path(prefix.share, "data", self.g4datasetname)
26+
install_tree(self.stage.source_path, install_path)
27+
28+
def setup_dependent_run_environment(self, env, dependent_spec):
29+
install_path = join_path(self.prefix.share, "data", self.g4datasetname)
30+
env.set("G4CHANNELINGDATA", install_path)
31+
32+
def url_for_version(self, version):
33+
"""Handle version string."""
34+
return f"http://geant4-data.web.cern.ch/geant4-data/datasets/G4CHANNELING.{version}.tar.gz"
35+
36+
@property
37+
def g4datasetname(self):
38+
return f"G4CHANNELING{self.spec.version}"

var/spack/repos/builtin/packages/g4emlow/package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class G4emlow(Package):
1818
maintainers("drbenmorgan")
1919

2020
# Only versions relevant to Geant4 releases built by spack are added
21+
version("8.6.1", sha256="4a93588d26080ce1d336b94f76fadabe4905fb8f1cba2415795023d6cd8f4a8a")
2122
version("8.6", sha256="fb7abed0d1db1d8b9ea364279b95e228d7bf3e3a5dc8d449b81665cada4a1a9e")
2223
version("8.5", sha256="66baca49ac5d45e2ac10c125b4fb266225e511803e66981909ce9cd3e9bcef73")
2324
version("8.4", sha256="d87de4d2a364cb0a1e1846560525ffc3f735ccdeea8bc426d61775179aebbe8e")

var/spack/repos/builtin/packages/g4ensdfstate/package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class G4ensdfstate(Package):
1818
maintainers("drbenmorgan")
1919

2020
# Only versions relevant to Geant4 releases built by spack are added
21+
version("3.0", sha256="4bdc3bd40b31d43485bf4f87f055705e540a6557d64ed85c689c59c9a4eba7d6")
2122
version("2.3", sha256="9444c5e0820791abd3ccaace105b0e47790fadce286e11149834e79c4a8e9203")
2223
version("2.2", sha256="dd7e27ef62070734a4a709601f5b3bada6641b111eb7069344e4f99a01d6e0a6")
2324
version("2.1", sha256="933e7f99b1c70f24694d12d517dfca36d82f4e95b084c15d86756ace2a2790d9")

var/spack/repos/builtin/packages/g4photonevaporation/package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class G4photonevaporation(Package):
1818
maintainers("drbenmorgan")
1919

2020
# Only versions relevant to Geant4 releases built by spack are added
21+
version("6.1", sha256="5ffc1f99a81d50c9020186d59874af73c53ba24c1842b3b82b3188223bb246f2")
2122
version("5.7", sha256="761e42e56ffdde3d9839f9f9d8102607c6b4c0329151ee518206f4ee9e77e7e5")
2223
version("5.5", sha256="5995dda126c18bd7f68861efde87b4af438c329ecbe849572031ceed8f5e76d7")
2324
version("5.3", sha256="d47ababc8cbe548065ef644e9bd88266869e75e2f9e577ebc36bc55bf7a92ec8")

var/spack/repos/builtin/packages/g4radioactivedecay/package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class G4radioactivedecay(Package):
1818
maintainers("drbenmorgan")
1919

2020
# Only versions relevant to Geant4 releases built by spack are added
21+
version("6.1.2", sha256="a40d7e3ebc64d35555c4a49d0ff1e0945cd605d84354d053121293914caea13a")
2122
version("5.6", sha256="3886077c9c8e5a98783e6718e1c32567899eeb2dbb33e402d4476bc2fe4f0df1")
2223
version("5.4", sha256="240779da7d13f5bf0db250f472298c3804513e8aca6cae301db97f5ccdcc4a61")
2324
version("5.3", sha256="5c8992ac57ae56e66b064d3f5cdfe7c2fee76567520ad34a625bfb187119f8c1")

var/spack/repos/builtin/packages/g4urrpt/package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class G4urrpt(Package):
1919
maintainers("drbenmorgan")
2020

2121
# Only versions relevant to Geant4 releases built by spack are added
22+
version("1.1", sha256="6a3432db80bc088aee19c504b9c0124913005d6357ea14870451400ab20d9c11")
2223
version("1.0", sha256="278eb6c4086e919d2c2a718eb44d4897b7e06d2a32909f6ed48eb8590b3f9977")
2324

2425
def install(self, spec, prefix):

var/spack/repos/builtin/packages/geant4-data/package.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,19 @@ class Geant4Data(BundlePackage):
4646
_datasets = {
4747
"11.3.0:11.3": [
4848
49-
50-
"g4photonevaporation@5.7",
51-
"g4radioactivedecay@5.6",
49+
50+
"g4photonevaporation@6.1",
51+
"g4radioactivedecay@6.1.2",
5252
5353
5454
5555
5656
5757
58-
58+
59+
5960
60-
"g4urrpt@1.0",
61+
"g4urrpt@1.1",
6162
],
6263
"11.2.2:11.2": [
6364

var/spack/repos/builtin/packages/geant4/package.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,8 @@ class Geant4(CMakePackage):
2121
executables = ["^geant4-config$"]
2222

2323
maintainers("drbenmorgan", "sethrj")
24-
version(
25-
"11.3.0.beta",
26-
sha256="572ba1570ca3b5b6f2a28ccbffa459901f6a986b79da1ebfdbf2f6f3dc5e14bf",
27-
deprecated=True,
28-
)
29-
version(
30-
"11.2.2",
31-
sha256="3a8d98c63fc52578f6ebf166d7dffaec36256a186d57f2520c39790367700c8d",
32-
preferred=True,
33-
)
24+
version("11.3.0", sha256="d9d71daff8890a7b5e0e33ea9a65fe6308ad6713000b43ba6705af77078e7ead")
25+
version("11.2.2", sha256="3a8d98c63fc52578f6ebf166d7dffaec36256a186d57f2520c39790367700c8d")
3426
version("11.2.1", sha256="76c9093b01128ee2b45a6f4020a1bcb64d2a8141386dea4674b5ae28bcd23293")
3527
version("11.2.0", sha256="9ff544739b243a24dac8f29a4e7aab4274fc0124fd4e1c4972018213dc6991ee")
3628
version("11.1.3", sha256="5d9a05d4ccf8b975649eab1d615fc1b8dce5937e01ab9e795bffd04149240db6")

0 commit comments

Comments
 (0)