feat: dd4hep-1.26

containers/jug/setup_detectors.py

@@ -105,7 +105,7 @@ if __name__ == '__main__':
                     subprocess.check_call(' '.join(cmd), shell=True)
             ## build
             cxxflags = ''
-            if os.environ['CXXFLAGS']:
+            if 'CXXFLAGS' in os.environ:
                 cxxflags = os.environ['CXXFLAGS']
             if cfg.get('cxxflags'):
                 cxxflags = cfg['cxxflags']

eic-spack.sh

@@ -3,7 +3,7 @@ EICSPACK_ORGREPO="eic/eic-spack"
 
 ## EIC spack github version, e.g. v0.19.7 or commit hash
 ## note: nightly builds will use e.g. releases/v0.19
-EICSPACK_VERSION="v0.20.12"
+EICSPACK_VERSION="dd4hep-1.26"
 
 ## Space-separated list of eic-spack cherry-picks
 read -r -d '' EICSPACK_CHERRYPICKS <<- \

spack-environment/packages.yaml

@@ -68,7 +68,7 @@ packages:
     - '@1_54a'
   dd4hep:
     require:
-    - '@1.25.1'
+    - '@1.26'
     - +ddg4 +ddcad +hepmc3 +lcio +xercesc
   dpmjet:
     require: