From 471df224957e8309e171d3cf32491298dccefc2f Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 9 Jun 2026 18:16:15 -0500 Subject: [PATCH 1/2] feat: use DD4hep G4HepEm plugin in npsim --- eic-spack.sh | 2 +- spack-environment/packages.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eic-spack.sh b/eic-spack.sh index ae2c5d5b..db341272 100644 --- a/eic-spack.sh +++ b/eic-spack.sh @@ -5,4 +5,4 @@ EICSPACK_ORGREPO="eic/eic-spack" ## EIC spack commit hash or github version, e.g. v0.19.7 ## note: nightly builds could use a branch e.g. releases/v0.19 -EICSPACK_VERSION="9cb75284f136ce8cf9bc54fe5b979e40e6eba485" +EICSPACK_VERSION="3f8e52f5790f29576b5a4699c3e7ae16d351b4d7" diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 97da78b7..a40fef76 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -36,7 +36,7 @@ packages: acts: require: - '@45.3.0' - - cxxstd=20 +dd4hep +edm4hep +examples +fatras +geant4 +json +onnx +podio +python +svg +root +pr4496 +pr4502 +pr4620 + - cxxstd=20 +dd4hep +edm4hep +examples +fatras +g4hepem +geant4 +json +onnx +podio +python +svg +root +pr4496 +pr4502 +pr4620 # ACTS requires same compiler as DD4hep since compiler options are reused - spec: '%gcc' when: '^dd4hep %gcc' @@ -329,7 +329,7 @@ packages: - '@0.0.3' npsim: require: - - '@1.6.0' + - '@git.g4hepem' - +http - any_of: [+geocad, -geocad] ollama: From bd5c4dc1345ab84c057008018f8bec000a431ead Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 9 Jun 2026 18:43:55 -0500 Subject: [PATCH 2/2] fix: {acts => dd4hep} +g4hepem --- spack-environment/packages.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index a40fef76..fbb65382 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -36,7 +36,7 @@ packages: acts: require: - '@45.3.0' - - cxxstd=20 +dd4hep +edm4hep +examples +fatras +g4hepem +geant4 +json +onnx +podio +python +svg +root +pr4496 +pr4502 +pr4620 + - cxxstd=20 +dd4hep +edm4hep +examples +fatras +geant4 +json +onnx +podio +python +svg +root +pr4496 +pr4502 +pr4620 # ACTS requires same compiler as DD4hep since compiler options are reused - spec: '%gcc' when: '^dd4hep %gcc' @@ -126,7 +126,7 @@ packages: dd4hep: require: - '@1.36' - - +ddg4 +ddcad +edm4hep +hepmc3 +xercesc + - +ddg4 +ddcad +edm4hep +g4hepem +hepmc3 +xercesc - any_of: [+ddeve +utilityapps, -ddeve -utilityapps] # FIXME ^root +x +opengl when +utilityapps doxygen: require: