From 3cbac4574ebfa638c0f9ac88c1c87be016e03b4a Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Fri, 8 Mar 2024 03:07:44 +0000
Subject: [PATCH] chore: geant4-11.2.1.east
---
containers/jug/setup_detectors.py | 4 ++--
spack-environment/packages.yaml | 2 +-
spack.sh | 10 ++++++++++
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/containers/jug/setup_detectors.py b/containers/jug/setup_detectors.py
index 79e14cc8a..340b72e1f 100755
--- a/containers/jug/setup_detectors.py
+++ b/containers/jug/setup_detectors.py
@@ -161,12 +161,12 @@ if __name__ == '__main__':
file=f)
## run once inside global prefix to initialize artifacts in /opt/detectors
os.environ['DETECTOR_PATH'] = args.prefix
- cmd = f'cd {args.prefix} && source {prefix}/setup.sh && checkGeometry -c {prefix}/share/{det}/{det}.xml'
+ cmd = f'cd {args.prefix} && source {prefix}/setup.sh && ddsim --compactFile {prefix}/share/{det}/{det}.xml --printLevel DEBUG -G -N1'
print(cmd)
process_list.append(subprocess.Popen(cmd, shell=True, executable='/bin/bash', stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
## run once inside specific prefix to initialize artifacts in $DETECTOR_PATH
os.environ['DETECTOR_PATH'] = args.prefix
- cmd = f'cd {prefix}/share/{det} && source {prefix}/setup.sh && checkGeometry -c {prefix}/share/{det}/{det}.xml'
+ cmd = f'cd {prefix}/share/{det} && source {prefix}/setup.sh && ddsim --compactFile {prefix}/share/{det}/{det}.xml --printLevel DEBUG -G -N1'
print(cmd)
process_list.append(subprocess.Popen(cmd, shell=True, executable='/bin/bash', stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index ba80eec86..bc7bd1bd2 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -128,7 +128,7 @@ packages:
prefix: /opt/software/externals/g4ndl
geant4:
require:
- - '@11.1.3.east'
+ - '@11.2.1.east'
- cxxstd=20 -vecgeom +threads -vtk
- any_of: [+opengl +qt +x11, -opengl -qt -x11]
gloo:
diff --git a/spack.sh b/spack.sh
index e1c35507d..574d5b98b 100644
--- a/spack.sh
+++ b/spack.sh
@@ -41,6 +41,11 @@ c264cf12a21c44358739fbe1fa674d2cb497ab5d
a0cd63c21067af59d6a976cc3e7b26c723e49373
c5e0270ef006b2b04d2f3f89bcaa6bf4d492faae
bcc5ded2051788d8d0800391d09379417c1caeb7
+eb57d96ea94b0543a8d5ba943444e77e414cc82e
+16d1ed35914262eea27cf41a2c99aea497adc17d
+c352db764598cc4d04299913646bb55d7613eb8a
+c31a998abb9f0b82a59bbfbf55b8111847aac8cb
+c5b8d5c92a88707d0c949b2bd507b2dfc1b79506
---
## Optional hash table with comma-separated file list
read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
@@ -82,3 +87,8 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
## a0cd63c21067af59d6a976cc3e7b26c723e49373: dd4hep: new version 1.27.2
## c5e0270ef006b2b04d2f3f89bcaa6bf4d492faae: dd4hep: remove self-referential dependencies
## bcc5ded2051788d8d0800391d09379417c1caeb7: dd4hep: new version 1.28
+## eb57d96ea94b0543a8d5ba943444e77e414cc82e: geant4/geant4-data: add v10.0.4
+## 16d1ed35914262eea27cf41a2c99aea497adc17d: geant4: new version 11.2.0
+## c352db764598cc4d04299913646bb55d7613eb8a: vecgeom: Use correct checksum for version 1.2.5
+## c31a998abb9f0b82a59bbfbf55b8111847aac8cb: VecGeom: new version 1.2.7 and fix URLs
+## c5b8d5c92a88707d0c949b2bd507b2dfc1b79506: geant4: new version v11.2.1
--
GitLab