From 9744123d56fc6c45a34c1c1eb5fcc236059ae5c4 Mon Sep 17 00:00:00 2001
From: Ivana Hrivnacova <Ivana.Hrivnacova@cern.ch>
Date: Thu, 25 Jun 2020 17:58:12 +0200
Subject: [PATCH] Fixed generation of Geant4 module file and clean-up: (#2319)

- Set "not-defined" value for data sets which are not valid for the built Geant4 version.
  This fixes a failure of the alienv call for older Geant4 versions where some of new data sets are not present.
- Removed setting of data set environment variables from env: section, as they are not used for the build.
---
 geant4.sh | 45 ++++++++++++++++-----------------------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/geant4.sh b/geant4.sh
index 03483cdc0c..d33416e817 100644
--- a/geant4.sh
+++ b/geant4.sh
@@ -14,19 +14,6 @@ incremental_recipe: |
   mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
 env:
   G4INSTALL : $GEANT4_ROOT
-  G4DATASEARCHOPT : "-mindepth 2 -maxdepth 4 -type d -wholename"
-  G4ABLADATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4ABLA*'`"  ## v10.4.px only
-  G4ENSDFSTATEDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4ENSDFSTATE*'`"
-  G4INCLDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4INCL*'`"  ## v10.5.px only
-  G4LEDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4EMLOW*'`"
-  G4LEVELGAMMADATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*PhotonEvaporation*'`"
-  G4NEUTRONHPDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4NDL*'`"
-  G4NEUTRONXSDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4NEUTRONXS*'`"   ## v10.4.px only
-  G4PARTICLEXSDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4PARTICLEXS*'`"   ## v10.5.px only
-  G4PIIDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4PII*'`"
-  G4RADIOACTIVEDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*RadioactiveDecay*'`"
-  G4REALSURFACEDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*RealSurface*'`"
-  G4SAIDXSDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT  '*data*G4SAIDDATA*'`"
 
 ---
 # if this variable is not defined default it to OFF
@@ -60,14 +47,14 @@ make install
 # in order to avoid putting hard-coded version numbers (which change with every G4 tag)
 # these variables are used to create the modulefile below
 G4DATASEARCHOPT="-mindepth 2 -maxdepth 4 -type d -wholename"
-G4ABLADATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4ABLA*'`  ## v10.4.px only
-G4ENSDFSTATEDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4ENSDFSTATE*'`  ## v10.5.px only
+G4ABLADATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4ABLA*'`
+G4ENSDFSTATEDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4ENSDFSTATE*'`
 G4INCLDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4INCL*'`
 G4LEDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4EMLOW*'`
 G4LEVELGAMMADATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*PhotonEvaporation*'`
 G4NEUTRONHPDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4NDL*'`
-G4NEUTRONXSDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4NEUTRONXS*'`   ## v10.4.px only
-G4PARTICLEXSDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4PARTICLEXS*'`  ## v10.5.px only
+G4NEUTRONXSDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4NEUTRONXS*'`
+G4PARTICLEXSDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4PARTICLEXS*'`
 G4PIIDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4PII*'`
 G4RADIOACTIVEDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*RadioactiveDecay*'`
 G4REALSURFACEDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*RealSurface*'`
@@ -95,18 +82,18 @@ setenv G4INSTALL \$GEANT4_ROOT
 setenv G4INSTALL_DATA \$::env(G4INSTALL)/share/
 setenv G4SYSTEM \$osname-g++
 
-setenv G4ABLADATA $G4ABLADATA
-setenv G4ENSDFSTATEDATA $G4ENSDFSTATEDATA
-setenv G4INCLDATA $G4INCLDATA
-setenv G4LEDATA $G4LEDATA
-setenv G4LEVELGAMMADATA $G4LEVELGAMMADATA
-setenv G4NEUTRONHPDATA $G4NEUTRONHPDATA
-setenv G4NEUTRONXSDATA #G4NEUTRONXSDATA
-setenv G4PARTICLEXSDATA $G4PARTICLEXSDATA
-setenv G4PIIDATA $G4PIIDATA
-setenv G4RADIOACTIVEDATA  $G4RADIOACTIVEDATA
-setenv G4REALSURFACEDATA $G4REALSURFACEDATA
-setenv G4SAIDXSDATA $G4SAIDXSDATA
+setenv G4ABLADATA ${G4ABLADATA:-not-defined}
+setenv G4ENSDFSTATEDATA ${G4ENSDFSTATEDATA:-not-defined}
+setenv G4INCLDATA ${G4INCLDATA:-not-defined}
+setenv G4LEDATA ${G4LEDATA:-not-defined}
+setenv G4LEVELGAMMADATA ${G4LEVELGAMMADATA:-not-defined}
+setenv G4NEUTRONHPDATA ${G4NEUTRONHPDATA:-not-defined}
+setenv G4NEUTRONXSDATA ${G4NEUTRONXSDATA:-not-defined}
+setenv G4PARTICLEXSDATA ${G4PARTICLEXSDATA:-not-defined}
+setenv G4PIIDATA ${G4PIIDATA:-not-defined}
+setenv G4RADIOACTIVEDATA  ${G4RADIOACTIVEDATA:-not-defined}
+setenv G4REALSURFACEDATA ${G4REALSURFACEDATA:-not-defined}
+setenv G4SAIDXSDATA ${G4SAIDXSDATA:-not-defined}
 set G4BASE \$::env(GEANT4_ROOT)
 prepend-path PATH \$G4BASE/bin
 prepend-path ROOT_INCLUDE_PATH \$G4BASE/include/Geant4