Merge pull request #6413 from mrodozov/update-geant-107can00-with-vec…

…geom Update geant 107can00 with vecgeom
cms-sw · Nov 14, 2020 · 8573605 · 8573605
2 parents ee73db8 + f5236bf
commit 8573605
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 10 deletions.
diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec
@@ -32,6 +32,7 @@ Requires: gcc-toolfile
 Requires: gdbm-toolfile
 Requires: geant4-toolfile
 Requires: geant4data-toolfile
+Requires: vecgeom-toolfile
 Requires: glimpse-toolfile
 Requires: gmake-toolfile
 Requires: gsl-toolfile

diff --git a/geant4-G4EMLOW.spec b/geant4-G4EMLOW.spec
@@ -1,4 +1,5 @@
-### RPM external geant4-G4EMLOW 7.9.1
+### RPM external geant4-G4EMLOW 7.13
 %define G4RunTime G4LEDATA
+%define source0 http://cmsrep.cern.ch/cmssw/download/geant4/G4EMLOW.%{realversion}.tar.gz
 
 ## IMPORT geant4-data-rpm
diff --git a/geant4-G4ENSDFSTATE.spec b/geant4-G4ENSDFSTATE.spec
@@ -1,4 +1,5 @@
-### RPM external geant4-G4ENSDFSTATE 2.2
+### RPM external geant4-G4ENSDFSTATE 2.3
 %define G4RunTime G4ENSDFSTATEDATA
+%define source0 http://cmsrep.cern.ch/cmssw/download/geant4/G4ENSDFSTATE.%{realversion}.tar.gz
 
 ## IMPORT geant4-data-rpm
diff --git a/geant4-G4PARTICLEXS.spec b/geant4-G4PARTICLEXS.spec
@@ -1,4 +1,5 @@
-### RPM external geant4-G4PARTICLEXS 2.1
+### RPM external geant4-G4PARTICLEXS 3.1
 %define G4RunTime G4PARTICLEXSDATA
+%define source0 http://cmsrep.cern.ch/cmssw/download/geant4/G4PARTICLEXS.%{realversion}.tar.gz
 
 ## IMPORT geant4-data-rpm
diff --git a/geant4-G4PhotonEvaporation.spec b/geant4-G4PhotonEvaporation.spec
@@ -1,4 +1,5 @@
-### RPM external geant4-G4PhotonEvaporation 5.5
+### RPM external geant4-G4PhotonEvaporation 5.7
 %define G4RunTime G4LEVELGAMMADATA
+%define source0 http://cmsrep.cern.ch/cmssw/download/geant4/G4PhotonEvaporation.%{realversion}.tar.gz
 
 ## IMPORT geant4-data-rpm
diff --git a/geant4-G4RadioactiveDecay.spec b/geant4-G4RadioactiveDecay.spec
@@ -1,5 +1,6 @@
-### RPM external geant4-G4RadioactiveDecay 5.4
+### RPM external geant4-G4RadioactiveDecay 5.6
 %define G4RunTime G4RADIOACTIVEDATA
+%define source0 http://cmsrep.cern.ch/cmssw/download/geant4/G4RadioactiveDecay.%{realversion}.tar.gz
 
 ## IMPORT geant4-data-rpm
 
diff --git a/geant4-G4RealSurface.spec b/geant4-G4RealSurface.spec
@@ -1,4 +1,5 @@
-### RPM external geant4-G4RealSurface 2.1.1
+### RPM external geant4-G4RealSurface 2.2
 %define G4RunTime G4REALSURFACEDATA
+%define source0 http://cmsrep.cern.ch/cmssw/download/geant4/G4RealSurface.%{realversion}.tar.gz
 
 ## IMPORT geant4-data-rpm
diff --git a/geant4-toolfile.spec b/geant4-toolfile.spec
@@ -45,6 +45,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/geant4core.xml
   <runtime name="ROOT_INCLUDE_PATH"  value="$INCLUDE" type="path"/>
   <flags cppdefines="GNU_GCC G4V9"/>
   <use name="clhep"/>
+  <use name="vecgeom"/>
   <use name="zlib"/>
   <use name="expat"/>
   <use name="xerces-c"/>
@@ -62,6 +63,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/geant4static.xml
     <environment name="LIBDIR" default="$GEANT4STATIC_BASE/lib/archive"/>
   </client>
   <use name="clhep"/>
+  <use name="vecgeom"/>
   <use name="zlib"/>
   <use name="expat"/>
   <use name="xerces-c"/>

diff --git a/geant4.spec b/geant4.spec
@@ -1,5 +1,5 @@
-### RPM external geant4 10.6.10
-%define tag 063863ea3f1f18807ab4dd51d8c03c56d80f1f41
+### RPM external geant4 10.7.0rc1
+%define tag a4e4079f1fe706a243a78ab2217ed28c44474700
 %define branch cms/v%{realversion}
 %define github_user cms-externals
 Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}.%{realversion}&output=/%{n}.%{realversion}-%{tag}.tgz
@@ -9,6 +9,7 @@ BuildRequires: cmake gmake
 Requires: clhep
 Requires: expat
 Requires: xerces-c
+Requires: vecgeom
 Requires: zlib
 
 %define keep_archives true
@@ -26,6 +27,7 @@ fi
 rm -rf ../build
 mkdir ../build
 cd ../build
+export VecGeom_DIR=${VECGEOM_ROOT}/lib/cmake/VecGeom 
 
 cmake ../%{n}.%{realversion} \
   -DCMAKE_CXX_COMPILER="g++" \
@@ -46,13 +48,13 @@ cmake ../%{n}.%{realversion} \
   -DGEANT4_BUILD_TLS_MODEL:STRING="global-dynamic" \
   -DGEANT4_ENABLE_TESTING=OFF \
   -DGEANT4_BUILD_VERBOSE_CODE=OFF \
-  -DGEANT4_USE_USOLIDS-ADVANCED:INTERNAL=1 \
+  -DGEANT4_USE_USOLIDS="all" \
   -DBUILD_SHARED_LIBS=ON \
   -DBUILD_STATIC_LIBS=ON \
   -DGEANT4_INSTALL_EXAMPLES=OFF \
   -DGEANT4_USE_SYSTEM_CLHEP=ON \
   -DGEANT4_USE_SYSTEM_EXPAT=ON \
-  -DCMAKE_PREFIX_PATH="${XERCES_C_ROOT};${CLHEP_ROOT};${EXPAT_ROOT};${ZLIB_ROOT}" \
+  -DCMAKE_PREFIX_PATH="${XERCES_C_ROOT};${CLHEP_ROOT};${EXPAT_ROOT};${ZLIB_ROOT};${VECGEOM_ROOT}" \
   -DGEANT4_USE_SYSTEM_ZLIB=ON \
   -DGEANT4_BUILD_MULTITHREADED=ON