2 added + 2 removed + 4 modified, total 8 files
slic
diff -u -r1.36 -r1.37
--- aclocal.m4 26 Aug 2010 18:04:38 -0000 1.36
+++ aclocal.m4 16 Feb 2011 21:16:17 -0000 1.37
@@ -1,4 +1,4 @@
-]dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.36 2010/08/26 18:04:38 jeremy Exp $
+]dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.37 2011/02/16 21:16:17 jeremy Exp $
dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
dnl Autoconf macros for SLIC and its dependencies.
@@ -597,3 +597,22 @@
AC_SUBST(PACKAGE_BUGREPORT)
])
+
+dnl Determine which Geant4 Physics Lists are available.
+AC_DEFUN(AC_GEANT4_PHYSLISTS, [
+
+dnl Get a list of physics lists by looking in G4 source code tree.
+G4PHYSLISTS=$(ls $G4INSTALL/source/physics_lists/lists/include/ | grep -v "^G4" | grep -v "HadronPhysics" | grep -v "Special" | grep -v "Cuts" | grep "\.hh" | sed -e 's/\.hh//g')
+
+dnl Create the list of includes and builders.
+G4PHYSLISTSINC="PhysicsListsInc"
+G4PHYSLISTSBUILD="PhysicsListsBuild"
+> $G4PHYSLISTSINC
+> $G4PHYSLISTSBUILD
+for physlist in $(echo $G4PHYSLISTS); do
+ echo -e "#include \"$physlist\"" >> $G4PHYSLISTSINC
+ echo -e "BUILDER( $physlist, \"\" )" >> $G4PHYSLISTSBUILD
+done
+AC_SUBST_FILE([G4PHYSLISTSINC])
+AC_SUBST_FILE([G4PHYSLISTSBUILD])
+])
slic
diff -u -r1.141 -r1.142
--- configure 3 Feb 2011 01:30:18 -0000 1.141
+++ configure 16 Feb 2011 21:16:17 -0000 1.142
@@ -313,7 +313,7 @@
ac_default_prefix=$SLIC_BASE
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE CPP EGREP G4_PREFIX G4WORKDIR G4SYSTEM GEANT4_FULL_VERSION GEANT4_MAJOR_VERSION GEANT4_MINOR_VERSION GEANT4_PATCH_VERSION CLHEP_PREFIX CLHEP_MAJOR_VERSION XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX LCDD_PREFIX LCIO_PREFIX USE_HEPPDT HEPPDT_PREFIX SLIC_PREFIX DOXYGEN PACKAGE_AUTHORS PACKAGE_FULLNAME PACKAGE_INSTITUTION PACKAGE_DATE PACKAGE_WWW LIBOBJS LTLIBOBJS'
-ac_subst_files=''
+ac_subst_files='G4PHYSLISTSINC G4PHYSLISTSBUILD'
# Initialize some variables set by options.
ac_init_help=
@@ -3539,6 +3539,21 @@
+G4PHYSLISTS=$(ls $G4INSTALL/source/physics_lists/lists/include/ | grep -v "^G4" | grep -v "HadronPhysics" | grep -v "Special" | grep -v "Cuts" | grep "\.hh" | sed -e 's/\.hh//g')
+
+G4PHYSLISTSINC="PhysicsListsInc"
+G4PHYSLISTSBUILD="PhysicsListsBuild"
+> $G4PHYSLISTSINC
+> $G4PHYSLISTSBUILD
+for physlist in $(echo $G4PHYSLISTS); do
+ echo -e "#include \"$physlist\"" >> $G4PHYSLISTSINC
+ echo -e "BUILDER( $physlist, \"\" )" >> $G4PHYSLISTSBUILD
+done
+
+
+
+
+
echo "$as_me:$LINENO: checking for CLHEP installation" >&5
echo $ECHO_N "checking for CLHEP installation... $ECHO_C" >&6
@@ -4048,6 +4063,8 @@
./config/setup/setup.sh
./include/Geant4VersionInfo.hh
./include/PackageInfo.hh
+ ./include/G4PhysicsLists.hh
+ ./include/G4PhysicsBuilders.icc
"
ac_config_files="$ac_config_files ${config_files}"
@@ -4725,6 +4742,10 @@
s,@PACKAGE_WWW@,$PACKAGE_WWW,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+/@G4PHYSLISTSINC@/r $G4PHYSLISTSINC
+s,@G4PHYSLISTSINC@,,;t t
+/@G4PHYSLISTSBUILD@/r $G4PHYSLISTSBUILD
+s,@G4PHYSLISTSBUILD@,,;t t
CEOF
_ACEOF
@@ -5002,5 +5023,3 @@
echo " gmake all"
echo
echo "The executable should be found at $SLIC_BASE/bin/$G4SYSTEM/slic once the build completes."
-echo
-echo "Thank you for using the SLIC simulator package."
slic
diff -u -r1.123 -r1.124
--- configure.ac 3 Feb 2011 01:30:18 -0000 1.123
+++ configure.ac 16 Feb 2011 21:16:17 -0000 1.124
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/configure.ac,v 1.123 2011/02/03 01:30:18 jeremy Exp $
+# $Header: /cvs/lcd/slic/configure.ac,v 1.124 2011/02/16 21:16:17 jeremy Exp $
#
# Process this file with autoconf to produce a configure script for SLIC.
#
@@ -46,6 +46,7 @@
AC_HAVE_G4VERSION
AC_HAVE_G4NIST
AC_USE_G4NIST
+AC_GEANT4_PHYSLISTS
dnl CLHEP
SIM_SETUP_CLHEP
@@ -93,6 +94,8 @@
./config/setup/setup.sh
./include/Geant4VersionInfo.hh
./include/PackageInfo.hh
+ ./include/G4PhysicsLists.hh
+ ./include/G4PhysicsBuilders.icc
"
AC_CONFIG_FILES(${config_files})
@@ -112,5 +115,3 @@
echo " gmake all"
echo
echo "The executable should be found at $SLIC_BASE/bin/$G4SYSTEM/slic once the build completes."
-echo
-echo "Thank you for using the SLIC simulator package."
slic/include
diff -N G4PhysicsBuilders.icc.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ G4PhysicsBuilders.icc.in 16 Feb 2011 21:16:17 -0000 1.1
@@ -0,0 +1 @@
+@G4PHYSLISTSBUILD@
slic/include
diff -N G4PhysicsLists.hh.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ G4PhysicsLists.hh.in 16 Feb 2011 21:16:17 -0000 1.1
@@ -0,0 +1 @@
+@G4PHYSLISTSINC@
slic/include
diff -N G4PhysicsBuilders.icc
--- G4PhysicsBuilders.icc 2 Jan 2011 06:44:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-BUILDER( CHIPS, "" )
-BUILDER( FTFP_BERT, "" )
-BUILDER( FTFP_BERT_EMV, "" )
-BUILDER( FTFP_BERT_EMX, "" )
-BUILDER( FTFP_BERT_TRV, "" )
-BUILDER( FTF_BIC, "" )
-BUILDER( LBE, "" )
-BUILDER( LHEP, "" )
-BUILDER( LHEP_EMV, "" )
-BUILDER( QBBC, "" )
-BUILDER( QGSC_BERT, "" )
-BUILDER( QGSC_CHIPS, "" )
-BUILDER( QGSP, "" )
-BUILDER( QGSP_BERT, "" )
-BUILDER( QGSP_BERT_CHIPS, "" )
-BUILDER( QGSP_BERT_EMV, "" )
-BUILDER( QGSP_BERT_EMX, "" )
-BUILDER( QGSP_BERT_HP, "" )
-BUILDER( QGSP_BERT_NOLEP, "" )
-BUILDER( QGSP_BERT_TRV, "" )
-BUILDER( QGSP_BIC, "" )
-BUILDER( QGSP_BIC_EMY, "" )
-BUILDER( QGSP_BIC_HP, "" )
-BUILDER( QGSP_FTFP_BERT, "" )
-BUILDER( QGSP_INCL_ABLA, "" )
-BUILDER( QGSP_QEL, "" )
-BUILDER( QGS_BIC, "" )
-BUILDER( Shielding, "" )
slic/include
diff -N G4PhysicsLists.hh
--- G4PhysicsLists.hh 2 Jan 2011 06:44:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-#include "CHIPS.hh"
-#include "FTFP_BERT.hh"
-#include "FTFP_BERT_EMV.hh"
-#include "FTFP_BERT_EMX.hh"
-#include "FTFP_BERT_TRV.hh"
-#include "FTF_BIC.hh"
-#include "LBE.hh"
-#include "LHEP.hh"
-#include "LHEP_EMV.hh"
-#include "QBBC.hh"
-#include "QGSC_BERT.hh"
-#include "QGSC_CHIPS.hh"
-#include "QGSP.hh"
-#include "QGSP_BERT.hh"
-#include "QGSP_BERT_CHIPS.hh"
-#include "QGSP_BERT_EMV.hh"
-#include "QGSP_BERT_EMX.hh"
-#include "QGSP_BERT_HP.hh"
-#include "QGSP_BERT_NOLEP.hh"
-#include "QGSP_BERT_TRV.hh"
-#include "QGSP_BIC.hh"
-#include "QGSP_BIC_EMY.hh"
-#include "QGSP_BIC_HP.hh"
-#include "QGSP_FTFP_BERT.hh"
-#include "QGSP_INCL_ABLA.hh"
-#include "QGSP_QEL.hh"
-#include "QGS_BIC.hh"
-#include "Shielding.hh"
slic/src
diff -u -r1.28 -r1.29
--- PhysicsListFactory.cc 3 Jan 2011 18:24:08 -0000 1.28
+++ PhysicsListFactory.cc 16 Feb 2011 21:16:17 -0000 1.29
@@ -1,42 +1,9 @@
-// $Header: /cvs/lcd/slic/src/PhysicsListFactory.cc,v 1.28 2011/01/03 18:24:08 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/PhysicsListFactory.cc,v 1.29 2011/02/16 21:16:17 jeremy Exp $
#include "PhysicsListFactory.hh"
-// Geant4
+// Include generated list of Geant4 PhysLists.
#include "G4PhysicsLists.hh"
-/*
-Old headers.
-#include "FTFC.hh"
-#include "FTFP.hh"
-#include "LBE.hh"
-#include "LHEP.hh"
-#include "LHEP_BERT.hh"
-#include "LHEP_BERT_HP.hh"
-#include "LHEP_EMV.hh"
-#include "LHEP_PRECO_HP.hh"
-#include "QBBC.hh"
-#include "QGSC.hh"
-#include "QGSC_EMV.hh"
-#include "QGSP.hh"
-#include "QGSP_BERT.hh"
-#include "QGSP_BERT_EMV.hh"
-#include "QGSP_BERT_HP.hh"
-#include "QGSP_BERT_NQE.hh"
-#include "QGSP_BERT_TRV.hh"
-#include "QGSP_BIC.hh"
-#include "QGSP_BIC_HP.hh"
-#include "QGSP_EMV.hh"
-#include "QGSP_EMV_NQE.hh"
-#include "QGSP_NQE.hh"
-#include "QGSP_QEL.hh"
-#include "FTFP_BERT.hh"
-#include "QGSC_BERT.hh"
-#include "QGSP_DIF.hh"
-#include "QGSP_BERT_DIF.hh"
-#include "QGS_BIC.hh"
-#include "FTF_BIC.hh"
-*/
-
// slic
#include "PhysicsListBuilder.hh"
@@ -109,40 +76,8 @@
*/
void PhysicsListFactory::initializeBuilders()
{
+// Include generated PhysList builders.
#include "G4PhysicsBuilders.icc"
-/*
- Old lists from before Geant4 9.4 kept here for reference.
-
- BUILDER(FTFC, "Fritiof with CHIPS")
- BUILDER(FTFP, "Fritiof with precompound")
- BUILDER(FTFP_BERT, "FTFP with Bertini Cascade")
- BUILDER(FTF_BIC, "FTF with new Bertini developments")
- BUILDER(LBE, "Low backgrounds experiment with low energy EM")
- BUILDER(LHEP, "Low and High Energy Parameterised")
- BUILDER(LHEP_BERT, "LHEP with Bertini Cascade")
- BUILDER(LHEP_BERT_HP, "LHEP with Bertini Cascade and high precision neutrons")
- BUILDER(LHEP_EMV, "LHEP with v 7.1 EM processes")
- BUILDER(LHEP_PRECO_HP, "LHEP_PRECO with HP")
- BUILDER(QBBC, "Uses best cross section data within QGSP")
- BUILDER(QGSC, "Quark Gluon-String (QGS) with CHIPS")
- BUILDER(QGSC_BERT, "QGSC with Bertini Cascade")
- BUILDER(QGSC_EMV, "QGSC with v 7.1 EM processes")
- BUILDER(QGSP, "QGS with precompound")
- BUILDER(QGSP_BERT, "QGSP with Bertini Cascade")
- BUILDER(QGSP_BERT_DIF, "QGSP_BERT with CHIPS diffractive scattering")
- BUILDER(QGSP_BERT_EMV, "QGSP_BERT with v 7.1 EM processes")
- BUILDER(QGSP_BERT_HP, "QGSP with Bertini Cascade and high precision neutrons")
- BUILDER(QGSP_BERT_NQE, "QGSP_BERT with quasi-elastic processes removed")
- BUILDER(QGSP_BERT_TRV, "QGSP_BERT with transition to Bertini at 5 GeV")
- BUILDER(QGSP_BIC, "QGSP with Binary Cascade")
- BUILDER(QGSP_BIC_HP, "QGSP with Binary Cascade")
- BUILDER(QGSP_DIF, "QGSP with CHIPS diffractive scattering")
- BUILDER(QGSP_EMV, "LHEP with v 7.1 EM processes")
- BUILDER(QGSP_EMV_NQE, "QGSP with v 7.1 EM processes and quasi-elastic processes removed")
- BUILDER(QGSP_NQE, "QGSP with quasi-elastic processes removed")
- BUILDER(QGSP_QEL, "QGSP with elastic cross sections and model from CHIPS")
- BUILDER(QGS_BIC, "QGS with new Bertini developments")
-*/
}
void PhysicsListFactory::addBuilder(VPhysicsListBuilder* builder)
CVSspam 0.2.8