Merge branch 'master' into geant4-11.4.0

Author: wdconinc

.gitlab-ci.yml

@@ -513,7 +513,7 @@ user_spack_environment:
   script:
     - source /opt/spack/share/spack/setup-env.sh
     - spack env activate --create edm4eic
-    - spack add edm4eic@git.main
+    - spack add edm4eic@git.main cxxstd=20
     - spack concretize 
     - spack install --only dependencies edm4eic
     - ls -al /opt/software/linux-*/compiler-wrapper-1.0-*/libexec/spack/gcc/g++

eic-spack.sh

@@ -3,4 +3,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="f16193d67aa36aab9c773590f5998ae47d9ba4b0"
+EICSPACK_VERSION="9f7ef015437f210c46122a3ff4de438cc35e3202"

spack-environment/packages.yaml

@@ -114,6 +114,9 @@ packages:
     - '@1.33'
     - +ddg4 +ddcad +edm4hep +hepmc3 +xercesc
     - any_of: [+ddeve +utilityapps, -ddeve -utilityapps] # FIXME ^root +x +opengl when +utilityapps
+  doxygen:
+    require:
+    - +graphviz
   dpmjet:
     require:
     - '@19.3.5'
@@ -122,7 +125,7 @@ packages:
     - '@656aa3192b097a631ddd1e0380e80c26fd6644a7'
   edm4eic:
     require:
-    - '@8.6.0' # EDM4EIC_VERSION
+    - '@8.7.0' # EDM4EIC_VERSION
     - cxxstd=20
   edm4hep:
     require:
@@ -135,7 +138,7 @@ packages:
       prefix: /usr
   eic-smear:
     require:
-    - '@1.1.15'
+    - '@1.1.16'
   eicrecon:
     require:
     - '@1.33.1' # EICRECON_VERSION
@@ -233,7 +236,7 @@ packages:
     - '@7.1.1-11:'
   irt:
     require:
-    - '@1.0.8'
+    - '@1.0.9'
   irt2:
     require:
     - '@2.1.0'

spack-environment/xl/spack.yaml

@@ -25,6 +25,7 @@ spack:
   - dawn
   - dawncut
   - dd4hep
+  - doxygen
   - east
   - edm4hep
   - eic-smear