SimDist/build
diff -u -r1.19 -r1.20
--- geant4.m4 18 Jul 2012 22:46:40 -0000 1.19
+++ geant4.m4 19 Jul 2012 00:38:33 -0000 1.20
@@ -374,5 +374,14 @@
AC_SUBST(G4RadioactiveDecay_FILE)
AC_SUBST(G4PhotonEvaporation_FILE)
+G4NDL_DIRNAME=G4NDL4.0
+G4EMLOW_DIRNAME=G4EMLOW6.23
+G4RadioactiveDecay_DIRNAME=RadioactiveDecay3.4
+G4PhotonEvaporation_DIRNAME=PhotonEvaporation2.2
+AC_SUBST(G4NDL_DIRNAME)
+AC_SUBST(G4EMLOW_DIRNAME)
+AC_SUBST(G4RadioactiveDecay_DIRNAME)
+AC_SUBST(G4PhotonEvaporation_DIRNAME)
+
])
SimDist/scripts
diff -u -r1.22 -r1.23
--- slic.sh.in 23 Sep 2011 22:40:13 -0000 1.22
+++ slic.sh.in 19 Jul 2012 00:38:33 -0000 1.23
@@ -53,14 +53,14 @@
# Setup Geant4 data directory locations.
export GEANT4_DATA_ROOT=${SIM_HOME}/packages/geant4/data
-export G4LEVELGAMMADATA=$(ls -d $GEANT4_DATA_ROOT/PhotonEvaporation*)
-export G4RADIOACTIVEDATA=$(ls -d $GEANT4_DATA_ROOT/RadioactiveDecay*)
-export G4LEDATA=$(ls -d $GEANT4_DATA_ROOT/G4EMLOW*)
-export G4NEUTRONHPDATA=$(ls -d $GEANT4_DATA_ROOT/G4NDL*)
-echo G4LEVELGAMMADATA=$G4LEVELGAMMADATA
-echo G4RADIOACTIVEDATA=$G4RADIOACTIVEDATA
-echo G4LEDATA=$G4LEDATA
-echo G4NEUTRONHPDATA=$G4NEUTRONHPDATA
+export G4LEVELGAMMADATA=${GEANT4_DATA_ROOT}/@G4PhotonEvaporation_DIRNAME@
+export G4RADIOACTIVEDATA=${GEANT4_DATA_ROOT}/@G4RadioactiveDecay_DIRNAME@
+export G4LEDATA=${GEANT4_DATA_ROOT}/@G4EMLOW_DIRNAME@
+export G4NEUTRONHPDATA=${GEANT4_DATA_ROOT}/@G4NDL_DIRNAME@
+echo G4LEVELGAMMADATA=${G4LEVELGAMMADATA}
+echo G4RADIOACTIVEDATA=${G4RADIOACTIVEDATA}
+echo G4LEDATA=${G4LEDATA}
+echo G4NEUTRONHPDATA=${G4NEUTRONHPDATA}
# Special setting for G4 physics.
export G4NEUTRONHP_NEGLECT_DOPPLER=@G4NEUTRONHP_NEGLECT_DOPPLER@