Print

Print


Commit in SimDist on MAIN
packages/geant4/Makefile.in+18-31.10 -> 1.11
scripts/slic.sh.in+121.8 -> 1.9
+30-3
2 modified files
JM: add support for Geant4 data files requested by Hans Wenzel

SimDist/packages/geant4
Makefile.in 1.10 -> 1.11
diff -u -r1.10 -r1.11
--- Makefile.in	14 May 2007 22:22:47 -0000	1.10
+++ Makefile.in	14 Nov 2007 23:59:50 -0000	1.11
@@ -1,10 +1,10 @@
-# $Header: /cvs/lcd/SimDist/packages/geant4/Makefile.in,v 1.10 2007/05/14 22:22:47 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/geant4/Makefile.in,v 1.11 2007/11/14 23:59:50 jeremy Exp $
 
 # package build
 include ../../build/package.gmk
 
 # default rule
-all: packageinfo debuginfo download config compile includes test
+all: packageinfo debuginfo download config compile includes install_data_files test
 
 # physics lists
 phys:
@@ -23,7 +23,7 @@
 	$(MAKE) clean;
 
 vis:
-	@echo "Rebuilding Geant4 visualization libraries..."; \
+	@echo "Rebuilding Geant4 visualization libraries ..."; \
 	cd $(G4INSTALL)/source/visualization; \
 	$(MAKE); \
 	cd $(G4INSTALL)/source/interfaces; \
@@ -32,6 +32,21 @@
 	cd $(G4INSTALL)/source; \
 	$(MAKE) libmap;
 
+GEANT4_DATA_URL := http://geant4.cern.ch/support/source
+
+install_data_files:
+	@echo "Installing Geant4 data files ..."; \
+	rm -rf $(PWD)/data/* ; \
+	wget -P $(PWD)/data \
+	$(GEANT4_DATA_URL)/G4NDL.3.11.tar.gz \
+	$(GEANT4_DATA_URL)/G4EMLOW.5.1.tar.gz \
+	$(GEANT4_DATA_URL)/G4RadioactiveDecay.3.2.tar.gz \
+	$(GEANT4_DATA_URL)/PhotonEvaporation.2.0.tar.gz; \
+	cd $(PWD)/data && \
+	for t in $$(ls *.tar.gz); do \
+	tar -zxf $$t; \
+	done
+
 debuginfo:
 	@echo CLHEP_BASE_DIR=$(CLHEP_BASE_DIR) ; \
 	echo CLHEP_INCLUDE_DIR=$(CLHEP_INCLUDE_DIR) ; \

SimDist/scripts
slic.sh.in 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- slic.sh.in	27 Jun 2006 19:16:39 -0000	1.8
+++ slic.sh.in	14 Nov 2007 23:59:50 -0000	1.9
@@ -36,5 +36,17 @@
 XERCES_LIB_DIR=${SIM_HOME}/packages/xerces/@XERCES_VERSION@/lib
 export @OS_SHARED_LIBS_VAR@=$XERCES_LIB_DIR:$@OS_SHARED_LIBS_VAR@
 
+# Setup Geant4 data directory locations.
+GEANT4_DATA_ROOT=${SIM_HOME}/packages/geant4/data
+G4LEVELGAMMADATA=$(find ${GEANT4_DATA_ROOT} -name "PhotonEvaporation*" -type d)
+G4RADIOACTIVEDATA=$(find ${GEANT4_DATA_ROOT} -name "RadioactiveDecay*" -type d)
+G4LEDATA=$(find ${GEANT4_DATA_ROOT} -name "G4EMLOW*" -type d)
+G4NEUTRONHPDATA=$(find ${GEANT4_DATA_ROOT} -name "G4NDL*" -type d)
+
+echo G4LEVELGAMMADATA=$G4LEVELGAMMADATA
+echo G4RADIOACTIVEDATA=$G4RADIOACTIVEDATA
+echo G4LEDATA=$G4LEDATA
+echo G4NEUTRONHPDATA=$G4NEUTRONHPDATA
+
 # run slic with CL args
 ${SLIC_BASE}/bin/@G4SYSTEM@/slic $@
CVSspam 0.2.8