SimDist
diff -u -r1.91 -r1.92
--- configure 3 Jan 2011 18:16:11 -0000 1.91
+++ configure 28 Mar 2011 20:37:38 -0000 1.92
@@ -273,7 +273,7 @@
PACKAGE_STRING='SimDist v1r0p0'
[log in to unmask]
-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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_SHARED_LIBS_VAR SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA JAVA_HOME JDK_HOME have_wget WGET have_scp SCP have_cmake CMAKE SLACCVSROOT SLACCVSUSER sim_dist_dir_basename packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir OGLHOME QTHOME clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_BASEDIR GDML_BUILDDIR GDML_CONFIG_OPTS GDML_!
CVSMODULE GEANT4_VERSION_DOWNLOAD GEANT4_VERSION GEANT4_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD G4SYSTEM G4INSTALL G4INCLUDE G4LIB G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA G4ELASTICDATA G4DEBUG G4ANALYSIS_USE G4UI_BUILD_XAW_SESSION G4UI_USE_XAW G4UI_BUILD_XM_SESSION G4UI_USE_XM G4UI_BUILD_WIN32_SESSION G4UI_USE_WIN32 G4VIS_BUILD_DAWN_DRIVER G4VIS_BUILD_OPENGLX_DRIVER G4VIS_BUILD_OPENGLXM_DRIVER G4VIS_BUILD_OPENGLWIN32_DRIVER G4VIS_BUILD_OIX_DRIVER G4VIS_BUILD_RAYTRACERX_DRIVER G4VIS_BUILD_OIWIN32_DRIVER G4VIS_BUILD_VRML_DRIVER G4VIS_USE_DAWN G4VIS_USE_OPENGLX G4VIS_USE_OPENGLXM G4VIS_USE_OPENGLWIN32 G4VIS_USE_OIX G4VIS_USE_RAYTRACERX G4VIS_USE_OIWIN32 G4VIS_USE_VRML G4LIB_BUILD_G3TOG4 G4LIB_USE_G3TOG4 G4LIB_BUILD_ZLIB G4LIB_USE_ZLIB G4LIB_BUILD_SHARED G4LIB_BUILD_STATIC G4LIB_USE_GRANULAR G4UI_USE_TCSH G4WORKDIR G4UI_NONE G4VIS_NONE G4VIS_BUILD_OPENGL_DRVIER G4VIS_USE_OPENGL G4VIS_BUILD_OPENGL G4VERBOSE G4UI_BUILD_QT_SESSION G4UI_USE_QT G4VIS_BUILD_OPENGLQT_DRIVER G4VIS!
_USE_OPENGLQT LCDD_BASEDIR LCDD_VERSION LCIO_BASEDIR LCIO_BUIL!
DDIR SLI
C_BINNAME SLIC_VERSION SLIC_BASEDIR xerces_version_dot XERCES_VERSION XERCES_BASEDIR XERCES_BUILDDIR XERCES_DIR_ORIG XERCES_DOWNLOAD XERCES_CONFIG XERCES_CONFIG_OPTS HEPPDT_CONFIG_OPTS HEPPDT_BASEDIR HEPPDT_BUILDDIR HEPPDT_DOWNLOAD HEPPDT_VERSION HEPPDT_DIR_ORIG LCDETECTORS_BASEDIR LCDETECTORS_VERSION dist_tarball dist_dir LIBOBJS LTLIBOBJS'
+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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_SHARED_LIBS_VAR SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA JAVA_HOME JDK_HOME have_wget WGET have_scp SCP have_cmake CMAKE SLACCVSROOT SLACCVSUSER sim_dist_dir_basename packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir OGLHOME QTHOME clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_BASEDIR GDML_BUILDDIR GDML_CONFIG_OPTS GDML_CV!
SMODULE GEANT4_VERSION_DOWNLOAD GEANT4_VERSION GEANT4_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD G4NEUTRONHP_NEGLECT_DOPPLER G4SYSTEM G4INSTALL G4INCLUDE G4LIB G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA G4ELASTICDATA G4DEBUG G4ANALYSIS_USE G4UI_BUILD_XAW_SESSION G4UI_USE_XAW G4UI_BUILD_XM_SESSION G4UI_USE_XM G4UI_BUILD_WIN32_SESSION G4UI_USE_WIN32 G4VIS_BUILD_DAWN_DRIVER G4VIS_BUILD_OPENGLX_DRIVER G4VIS_BUILD_OPENGLXM_DRIVER G4VIS_BUILD_OPENGLWIN32_DRIVER G4VIS_BUILD_OIX_DRIVER G4VIS_BUILD_RAYTRACERX_DRIVER G4VIS_BUILD_OIWIN32_DRIVER G4VIS_BUILD_VRML_DRIVER G4VIS_USE_DAWN G4VIS_USE_OPENGLX G4VIS_USE_OPENGLXM G4VIS_USE_OPENGLWIN32 G4VIS_USE_OIX G4VIS_USE_RAYTRACERX G4VIS_USE_OIWIN32 G4VIS_USE_VRML G4LIB_BUILD_G3TOG4 G4LIB_USE_G3TOG4 G4LIB_BUILD_ZLIB G4LIB_USE_ZLIB G4LIB_BUILD_SHARED G4LIB_BUILD_STATIC G4LIB_USE_GRANULAR G4UI_USE_TCSH G4WORKDIR G4UI_NONE G4VIS_NONE G4VIS_BUILD_OPENGL_DRVIER G4VIS_USE_OPENGL G4VIS_BUILD_OPENGL G4VERBOSE G4UI_BU!
ILD_QT_SESSION G4UI_USE_QT G4VIS_BUILD_OPENGLQT_DRIVER G4VIS_U!
SE_OPENG
LQT LCDD_BASEDIR LCDD_VERSION LCIO_BASEDIR LCIO_BUILDDIR SLIC_BINNAME SLIC_VERSION SLIC_BASEDIR xerces_version_dot XERCES_VERSION XERCES_BASEDIR XERCES_BUILDDIR XERCES_DIR_ORIG XERCES_DOWNLOAD XERCES_CONFIG XERCES_CONFIG_OPTS HEPPDT_CONFIG_OPTS HEPPDT_BASEDIR HEPPDT_BUILDDIR HEPPDT_DOWNLOAD HEPPDT_VERSION HEPPDT_DIR_ORIG LCDETECTORS_BASEDIR LCDETECTORS_VERSION dist_tarball dist_dir LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -815,6 +815,9 @@
--enable-g4verbose Enable or disable setting G4VERBOSE.
+ --enable-g4neutronhp-neglect-doppler
+ Set to yes to turn off doppler in neutron physics.
+
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -2906,6 +2909,33 @@
+echo "$as_me:$LINENO: checking whether to set G4NEUTRONHP_NEGLECT_DOPPLER" >&5
+echo $ECHO_N "checking whether to set G4NEUTRONHP_NEGLECT_DOPPLER... $ECHO_C" >&6
+
+# Check whether --enable-g4neutronhp-neglect-doppler or --disable-g4neutronhp-neglect-doppler was given.
+if test "${enable_g4neutronhp_neglect_doppler+set}" = set; then
+ enableval="$enable_g4neutronhp_neglect_doppler"
+
+fi;
+
+G4NEUTRONHP_NEGLECT_DOPPLER=1
+
+if test "${enable_g4neutronhp_neglect_doppler}" == "no"; then
+ G4NEUTRONHP_NEGLECT_DOPPLER=0
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+else
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+fi
+
+
+
+
+
+
+
+
@@ -3877,6 +3907,7 @@
s,@GEANT4_BUILDDIR@,$GEANT4_BUILDDIR,;t t
s,@GEANT4_DIR_ORIG@,$GEANT4_DIR_ORIG,;t t
s,@GEANT4_DOWNLOAD@,$GEANT4_DOWNLOAD,;t t
+s,@G4NEUTRONHP_NEGLECT_DOPPLER@,$G4NEUTRONHP_NEGLECT_DOPPLER,;t t
s,@G4SYSTEM@,$G4SYSTEM,;t t
s,@G4INSTALL@,$G4INSTALL,;t t
s,@G4INCLUDE@,$G4INCLUDE,;t t
SimDist/build
diff -u -r1.12 -r1.13
--- geant4.m4 8 Sep 2010 23:04:05 -0000 1.12
+++ geant4.m4 28 Mar 2011 20:37:38 -0000 1.13
@@ -144,6 +144,9 @@
dnl Config verbose setting. No verbose means better performance.
AC_ENABLE_G4VERBOSE
+dnl Setting for G4 physics lists.
+AC_ENABLE_G4NEUTRONHP_NEGLECT_DOPPLER
+
dnl Variable substitutions for Geant4 environment.
AC_SUBST(G4SYSTEM)
AC_SUBST(G4INSTALL)
@@ -236,3 +239,29 @@
fi
])
+
+dnl Setting of G4NEUTRONHP_NEGLECT_DOPPLER for G4 physics lists.
+AC_DEFUN(AC_ENABLE_G4NEUTRONHP_NEGLECT_DOPPLER, [
+
+AC_MSG_CHECKING(whether to set G4NEUTRONHP_NEGLECT_DOPPLER)
+
+AC_ARG_ENABLE([g4neutronhp-neglect-doppler],
+ AC_HELP_STRING([--enable-g4neutronhp-neglect-doppler],
+ [Set to yes to turn off doppler in neutron physics.])
+ )
+
+dnl This var is on by default.
+G4NEUTRONHP_NEGLECT_DOPPLER=1
+
+dnl Check whether it should be turned off.
+if test "${enable_g4neutronhp_neglect_doppler}" == "no"; then
+ G4NEUTRONHP_NEGLECT_DOPPLER=0
+ AC_MSG_RESULT(no)
+else
+ AC_MSG_RESULT(yes)
+fi
+
+
+AC_SUBST(G4NEUTRONHP_NEGLECT_DOPPLER)
+
+])
SimDist/scripts
diff -u -r1.16 -r1.17
--- slic.sh.in 10 Sep 2010 20:59:29 -0000 1.16
+++ slic.sh.in 28 Mar 2011 20:37:38 -0000 1.17
@@ -60,6 +60,9 @@
echo G4LEDATA=$G4LEDATA
echo G4NEUTRONHPDATA=$G4NEUTRONHPDATA
+# Special setting for G4 physics.
+export G4NEUTRONHP_NEGLECT_DOPPLER=@G4NEUTRONHP_NEGLECT_DOPPLER@
+
# local GDML schemas
GDML_SCHEMA_DIR=${SIM_HOME}/packages/lcdd/${LCDD_VERSION}
echo "GDML_SCHEMA_DIR=${GDML_SCHEMA_DIR}"
