7 modified files
slic
diff -u -r1.28 -r1.29
--- GNUmakefile 19 Oct 2005 23:09:32 -0000 1.28
+++ GNUmakefile 5 Dec 2005 21:12:18 -0000 1.29
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/GNUmakefile,v 1.28 2005/10/19 23:09:32 jeremy Exp $
+# $Header: /cvs/lcd/slic/GNUmakefile,v 1.29 2005/12/05 21:12:18 jeremy Exp $
#
# Makefile for SLIC simulation package based on examples GNUmakefile by G. Cosmo.
#
@@ -59,10 +59,12 @@
endif
# LCPhys
-ifdef LCPHYS_BASE
- include $(MAKEINCLUDES)/lcphys.gmk
-else
- $(error define LCPHYS_BASE=/path/to/LCPhys)
+ifdef SLIC_USE_LCPHYS
+ ifdef LCPHYS_BASE
+ include $(MAKEINCLUDES)/lcphys.gmk
+ else
+ $(error define LCPHYS_BASE=/path/to/LCPhys)
+ endif
endif
# G4 hadronic lists
slic
diff -u -r1.7 -r1.8
--- GNUmakefile.local.in 25 Oct 2005 22:39:09 -0000 1.7
+++ GNUmakefile.local.in 5 Dec 2005 21:12:18 -0000 1.8
@@ -1,8 +1,8 @@
-# $Header: /cvs/lcd/slic/GNUmakefile.local.in,v 1.7 2005/10/25 22:39:09 jeremy Exp $
+# $Header: /cvs/lcd/slic/GNUmakefile.local.in,v 1.8 2005/12/05 21:12:18 jeremy Exp $
#
# Local build settings generated by configure
#
-# *** DO NOT EDIT MANUALLY. ***
+# *** DO NOT EDIT MANUALLY. ***
#
# To change the settings in GNUmakefile.local, rerun configure.
#
@@ -12,11 +12,19 @@
SLIC_CXXFLAGS = @CXXFLAGS@
SLIC_DEFS = @DEFS@
+enable_lcphys = @enable_lcphys@
+ifeq ($(enable_lcphys),yes)
+ SLIC_USE_LCPHYS = 1
+endif
+
# SLIC base dir
SLIC_BASE = @SLIC_PREFIX@
-# SLIC_VERBOSE could be defined here...
-@SLIC_VERBOSE_SET@
+# SLIC_VERBOSE
+enable_slic_verbose = @enable_slic_verbose@
+ifeq ($(enable_slic_verbose),yes)
+ SLIC_VERBOSE=1
+endif
# LCIO base dir var
LCIO = @LCIO_PREFIX@
slic
diff -u -r1.17 -r1.18
--- aclocal.m4 1 Dec 2005 18:30:29 -0000 1.17
+++ aclocal.m4 5 Dec 2005 21:12:18 -0000 1.18
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/aclocal.m4,v 1.17 2005/12/01 18:30:29 jeremy Exp $
+# $Header: /cvs/lcd/slic/aclocal.m4,v 1.18 2005/12/05 21:12:18 jeremy Exp $
#
# local m4 macros for SLIC autoconf
#
@@ -49,7 +49,7 @@
# make sure to compile with debugging switches
CXXFLAGS="${CXXFLAGS} -g -ggdb -pg"
else
- AC_MSG_RESULT(No)
+ AC_MSG_RESULT(no)
fi
# enable SLIC verbose system
@@ -70,10 +70,7 @@
# GNUmakefile vars
G4VERBOSE_SET="G4VERBOSE=1"
AC_SUBST(G4VERBOSE_SET)
-
- SLIC_VERBOSE_SET="SLIC_VERBOSE=1"
- AC_SUBST(SLIC_VERBOSE_SET)
-
+ AC_SUBST(enable_slic_verbose)
else
AC_MSG_RESULT(No)
fi
@@ -97,7 +94,7 @@
CXXFLAGS="${CXXFLAGS} -Wall -v -Wl,--verbose"
else
- AC_MSG_RESULT(No)
+ AC_MSG_RESULT(no)
fi
])
@@ -182,7 +179,7 @@
if $host_os == "WIN32"
then
g4system_os=WIN32
- else
+ else
g4system_os=`uname`
fi
@@ -347,26 +344,57 @@
AC_HELP_STRING([--with-lcphys=<path>],[ LCPhys installation base [[LCPHYS_BASE]] ]),
[LCPHYS_PREFIX=$with_lcphys])
-if test -z "${with_lcphys}"; then
- if test -n "$LCPHYS_BASE"; then
- LCPHYS_PREFIX=${LCPHYS_BASE} # env
+if test "$enable_lcphys" = "yes"
+then
+
+ if test -z "${with_lcphys}"; then
+ if test -n "$LCPHYS_BASE"; then
+ LCPHYS_PREFIX=${LCPHYS_BASE} # env
+ else
+ AC_MSG_RESULT(no)
+ fi
+ fi
+
+ LCPHYS_TEST_FILE=${LCPHYS_PREFIX}/include/LCPhysicsList.hh
+
+ if test -e "${LCPHYS_TEST_FILE}"; then
+ AC_MSG_RESULT(${LCPHYS_PREFIX})
else
- AC_MSG_RESULT(No)
- AC_MSG_ERROR(LCPhys installation was not found) # not found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR(invalid LCPhys installation at ${LCPHYS_PREFIX})
fi
+
+ AC_SUBST(LCPHYS_PREFIX)
+else
+ AC_MSG_RESULT(disabled)
fi
-LCPHYS_TEST_FILE=${LCPHYS_PREFIX}/include/LCPhysicsList.hh
+AC_SUBST(enable_lcphys)
+
+])
+
+# macro to check whether LCPhys library should be enabled
+AC_DEFUN(SIM_ENABLE_LCPHYS, [
-if test -e "${LCPHYS_TEST_FILE}"; then
+AC_MSG_CHECKING(whether to enable LCPhys)
+
+AC_ARG_ENABLE(lcphys,
+ AC_HELP_STRING([--enable-lcphys=<yes|no>], [ enable LCPhys library ]),,)
+
+if test "X${enable_lcphys}" = "X"
+then
+ enable_lcphys=yes
+fi
+
+if test "${enable_lcphys}" = "yes"
+then
AC_MSG_RESULT(yes)
- echo "found valid LCPhys installation at ${LCPHYS_PREFIX}"
+ AC_DEFINE(HAVE_LCPHYS)
+ AC_DEFINE(SLIC_USE_LCPHYS)
else
- AC_MSG_ERROR(invalid LCPhys installation at ${LCPHYS_PREFIX})
+ AC_MSG_RESULT(no)
fi
-AC_SUBST(LCPHYS_PREFIX)
-
])
# /\/\/\ GDML /\/\/\
slic
diff -u -r1.33 -r1.34
--- configure 30 Nov 2005 01:09:06 -0000 1.33
+++ configure 5 Dec 2005 21:12:18 -0000 1.34
@@ -274,7 +274,7 @@
ac_unique_file="slic.cc"
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 G4_PREFIX G4WORKDIR G4SYSTEM CLHEP_PREFIX XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX LCDD_PREFIX LCIO_PREFIX LCPHYS_PREFIX SLIC_PREFIX G4DEBUG_SET G4PROFILE_SET G4VERBOSE_SET SLIC_VERBOSE_SET DOXYGEN PACKAGE_AUTHORS PACKAGE_FULLNAME PACKAGE_INSTITUTION PACKAGE_DATE PACKAGE_WWW 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 CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE G4_PREFIX G4WORKDIR G4SYSTEM CLHEP_PREFIX XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX LCDD_PREFIX LCIO_PREFIX LCPHYS_PREFIX enable_lcphys SLIC_PREFIX G4DEBUG_SET G4PROFILE_SET G4VERBOSE_SET enable_slic_verbose DOXYGEN PACKAGE_AUTHORS PACKAGE_FULLNAME PACKAGE_INSTITUTION PACKAGE_DATE PACKAGE_WWW LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -812,6 +812,8 @@
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-package-info Rewrite include/PackageInfo.hh
+ --enable-lcphys=<yes|no>
+ enable LCPhys library
--enable-slic-debug Enable debugging in code by setting SLIC_DEBUG,
G4DEBUG and G4PROFILE
--enable-slic-verbose Enable usage of verbose output using SLIC_VERBOSE
@@ -2570,8 +2572,8 @@
G4_TEST_FILE=${G4_PREFIX}/Configure
if test -e ${G4_TEST_FILE}; then
- echo "$as_me:$LINENO: result: Yes" >&5
-echo "${ECHO_T}Yes" >&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
echo "found valid Geant4 installation at ${G4_PREFIX}"
else
{ { echo "$as_me:$LINENO: error: invalid Geant4 installation at ${G4_PREFIX}" >&5
@@ -2618,8 +2620,8 @@
{ (exit 1); exit 1; }; }
fi
else
- echo "$as_me:$LINENO: result: Yes" >&5
-echo "${ECHO_T}Yes" >&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
fi
@@ -2655,8 +2657,8 @@
CLHEP_TEST_FILE=${CLHEP_PREFIX}/include/CLHEP/Evaluator/Evaluator.h
if test -e ${CLHEP_TEST_FILE}; then
- echo "$as_me:$LINENO: result: Yes" >&5
-echo "${ECHO_T}Yes" >&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
echo "found valid CLHEP installation at ${CLHEP_PREFIX}"
else
{ { echo "$as_me:$LINENO: error: invalid CLHEP installation at ${CLHEP_PREFIX}" >&5
@@ -2701,8 +2703,8 @@
XERCES_TEST_FILE=${XERCES_PREFIX}/include/xercesc/dom/DOM.hpp
if test -e "${XERCES_TEST_FILE}"; then
- echo "$as_me:$LINENO: result: Yes" >&5
-echo "${ECHO_T}Yes" >&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
echo "found valid Xerces installation at ${XERCES_PREFIX}"
else
{ { echo "$as_me:$LINENO: error: invalid Xerces installation at ${XERCES_PREFIX}" >&5
@@ -2763,8 +2765,8 @@
GDML_TEST_FILE=${GDML_PREFIX}/Common/Saxana/src/SAXProcessor.cpp
if test -e "${GDML_TEST_FILE}"; then
- echo "$as_me:$LINENO: result: Yes" >&5
-echo "${ECHO_T}Yes" >&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
echo "found valid GDML installation at ${GDML_PREFIX}"
else
{ { echo "$as_me:$LINENO: error: invalid GDML installation at ${GDML_PREFIX}" >&5
@@ -2804,8 +2806,8 @@
LCDD_TEST_FILE=${LCDD_PREFIX}/src/LCDDDetectorConstruction.cc
if test -e ${LCDD_TEST_FILE}; then
- echo "$as_me:$LINENO: result: Yes" >&5
-echo "${ECHO_T}Yes" >&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
echo "found valid LCDD installation at ${LCDD_PREFIX}"
else
{ { echo "$as_me:$LINENO: error: invalid LCDD installation at ${LCDD_PREFIX}" >&5
@@ -2846,8 +2848,8 @@
LCIO_TEST_FILE=${LCIO_PREFIX}/src/aid/EVENT/LCEvent.aid
if test -e ${LCIO_TEST_FILE}; then
- echo "$as_me:$LINENO: result: Yes" >&5
-echo "${ECHO_T}Yes" >&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
echo "found valid LCIO installation at ${LCIO_PREFIX}."
else
echo "$as_me:$LINENO: result: No" >&5
@@ -2862,6 +2864,42 @@
+# LCPhys enable
+
+
+echo "$as_me:$LINENO: checking whether to enable LCPhys" >&5
+echo $ECHO_N "checking whether to enable LCPhys... $ECHO_C" >&6
+
+# Check whether --enable-lcphys or --disable-lcphys was given.
+if test "${enable_lcphys+set}" = set; then
+ enableval="$enable_lcphys"
+
+fi;
+
+if test "X${enable_lcphys}" = "X"
+then
+ enable_lcphys=yes
+fi
+
+if test "${enable_lcphys}" = "yes"
+then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_LCPHYS 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define SLIC_USE_LCPHYS 1
+_ACEOF
+
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+
# LCPhys
@@ -2875,28 +2913,35 @@
LCPHYS_PREFIX=$with_lcphys
fi;
-if test -z "${with_lcphys}"; then
- if test -n "$LCPHYS_BASE"; then
- LCPHYS_PREFIX=${LCPHYS_BASE} # env
- else
- echo "$as_me:$LINENO: result: No" >&5
-echo "${ECHO_T}No" >&6
- { { echo "$as_me:$LINENO: error: LCPhys installation was not found" >&5
-echo "$as_me: error: LCPhys installation was not found" >&2;}
- { (exit 1); exit 1; }; } # not found
+if test "$enable_lcphys" = "yes"
+then
+
+ if test -z "${with_lcphys}"; then
+ if test -n "$LCPHYS_BASE"; then
+ LCPHYS_PREFIX=${LCPHYS_BASE} # env
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ fi
fi
-fi
-LCPHYS_TEST_FILE=${LCPHYS_PREFIX}/include/LCPhysicsList.hh
+ LCPHYS_TEST_FILE=${LCPHYS_PREFIX}/include/LCPhysicsList.hh
-if test -e "${LCPHYS_TEST_FILE}"; then
- echo "$as_me:$LINENO: result: Yes" >&5
-echo "${ECHO_T}Yes" >&6
- echo "found valid LCPhys installation at ${LCPHYS_PREFIX}"
-else
- { { echo "$as_me:$LINENO: error: invalid LCPhys installation at ${LCPHYS_PREFIX}" >&5
+ if test -e "${LCPHYS_TEST_FILE}"; then
+ echo "$as_me:$LINENO: result: ${LCPHYS_PREFIX}" >&5
+echo "${ECHO_T}${LCPHYS_PREFIX}" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ { { echo "$as_me:$LINENO: error: invalid LCPhys installation at ${LCPHYS_PREFIX}" >&5
echo "$as_me: error: invalid LCPhys installation at ${LCPHYS_PREFIX}" >&2;}
{ (exit 1); exit 1; }; }
+ fi
+
+
+else
+ echo "$as_me:$LINENO: result: disabled" >&5
+echo "${ECHO_T}disabled" >&6
fi
@@ -2918,8 +2963,8 @@
echo "$as_me: error: Not a valid SLIC installation at $SLIC_PREFIX" >&2;}
{ (exit 1); exit 1; }; }
else
- echo "$as_me:$LINENO: result: Yes" >&5
-echo "${ECHO_T}Yes" >&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
fi
@@ -2939,8 +2984,8 @@
# default to non-debug mode
if test -n "${SLIC_DEBUG_ENABLE}" && test "${SLIC_DEBUG_ENABLE}" != "no"; then
- echo "$as_me:$LINENO: result: Yes" >&5
-echo "${ECHO_T}Yes" >&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
# GNUmakefile vars
G4DEBUG_SET="G4DEBUG_SET=1"
@@ -2966,8 +3011,8 @@
# make sure to compile with debugging switches
CXXFLAGS="${CXXFLAGS} -g -ggdb -pg"
else
- echo "$as_me:$LINENO: result: No" >&5
-echo "${ECHO_T}No" >&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
# enable SLIC verbose system
@@ -2982,8 +3027,8 @@
# yes or null (not specified) then set verbose system to on
if test "${SLIC_VERBOSE_ENABLE}" = "yes" || test -z "${SLIC_VERBOSE_ENABLE}"; then
- echo "$as_me:$LINENO: result: Yes" >&5
-echo "${ECHO_T}Yes" >&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
# compiler defines
cat >>confdefs.h <<\_ACEOF
@@ -2999,9 +3044,6 @@
G4VERBOSE_SET="G4VERBOSE=1"
- SLIC_VERBOSE_SET="SLIC_VERBOSE=1"
-
-
else
echo "$as_me:$LINENO: result: No" >&5
echo "${ECHO_T}No" >&6
@@ -3024,15 +3066,15 @@
# specified and not = no
if test -n "${SLIC_COMPILE_VERBOSE_ENABLE}" && test "${SLIC_COMPILE_VERBOSE_ENABLE}" != "no"; then
- echo "$as_me:$LINENO: result: Yes" >&5
-echo "${ECHO_T}Yes" >&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
# verbose compiler commands into cpp flags
CXXFLAGS="${CXXFLAGS} -Wall -v -Wl,--verbose"
else
- echo "$as_me:$LINENO: result: No" >&5
-echo "${ECHO_T}No" >&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
@@ -3801,11 +3843,12 @@
s,@LCDD_PREFIX@,$LCDD_PREFIX,;t t
s,@LCIO_PREFIX@,$LCIO_PREFIX,;t t
s,@LCPHYS_PREFIX@,$LCPHYS_PREFIX,;t t
+s,@enable_lcphys@,$enable_lcphys,;t t
s,@SLIC_PREFIX@,$SLIC_PREFIX,;t t
s,@G4DEBUG_SET@,$G4DEBUG_SET,;t t
s,@G4PROFILE_SET@,$G4PROFILE_SET,;t t
s,@G4VERBOSE_SET@,$G4VERBOSE_SET,;t t
-s,@SLIC_VERBOSE_SET@,$SLIC_VERBOSE_SET,;t t
+s,@enable_slic_verbose@,$enable_slic_verbose,;t t
s,@DOXYGEN@,$DOXYGEN,;t t
s,@PACKAGE_AUTHORS@,$PACKAGE_AUTHORS,;t t
s,@PACKAGE_FULLNAME@,$PACKAGE_FULLNAME,;t t
slic
diff -u -r1.28 -r1.29
--- configure.ac 30 Nov 2005 01:09:06 -0000 1.28
+++ configure.ac 5 Dec 2005 21:12:19 -0000 1.29
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/configure.ac,v 1.28 2005/11/30 01:09:06 jeremy Exp $
+# $Header: /cvs/lcd/slic/configure.ac,v 1.29 2005/12/05 21:12:19 jeremy Exp $
#
# Process this file with autoconf to produce a configure script for SLIC.
#
@@ -63,6 +63,9 @@
# LCIO
SIM_SETUP_LCIO()
+# LCPhys enable
+SIM_ENABLE_LCPHYS()
+
# LCPhys
SIM_SETUP_LCPHYS()
slic/src
diff -u -r1.12 -r1.13
--- PhysicsListFactory.cc 19 Oct 2005 22:51:17 -0000 1.12
+++ PhysicsListFactory.cc 5 Dec 2005 21:12:19 -0000 1.13
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/PhysicsListFactory.cc,v 1.12 2005/10/19 22:51:17 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/PhysicsListFactory.cc,v 1.13 2005/12/05 21:12:19 jeremy Exp $
#include "PhysicsListFactory.hh"
// slic
@@ -14,47 +14,51 @@
#include "LHEP_BERT.hh"
#include "QGSP_BIC.hh"
-// D. Wright's LC Physics list
+// Dennis Wright's LC Physics list
+#ifdef SLIC_USE_LCPHYS
#include "LCPhysicsList.hh"
+#endif
namespace slic
{
/**
* @param name The name of the physics list to instantiate.
- * @return G4VUserPhysicsList base object with concrete type such as LHEP.
+ * @return G4VUserPhysicsList base object with concrete type such as LHEP.
*/
G4VUserPhysicsList* PhysicsListFactory::create( const std::string& name )
{
G4cout << "Creating physics list <" << name << ">." << G4endl;
- // DW's LC physics
- if ( name == "LCPhys" ) return new LCPhysicsList;
-
// Fritiof with CHIPS
- else if( name == "FTFC" ) return new FTFC;
+ if( name == "FTFC" ) return new FTFC;
- // Fritiof with precompound
+ // DW's LC physics
+#ifdef SLIC_USE_LCPHYS
+ else if ( name == "LCPhys" ) return new LCPhysicsList;
+#endif
+
+ // Fritiof with precompound
else if( name == "FTFP" ) return new FTFP;
-
+
// low/high energy param
- else if( name == "LHEP" ) return new LHEP;
+ else if( name == "LHEP" ) return new LHEP;
// quark gluon-string with CHIPS
else if( name == "QGSC" ) return new QGSC;
// quark-gluon-string with precompound
- else if( name == "QGSP" ) return new QGSP;
+ else if( name == "QGSP" ) return new QGSP;
// QGSP and Bertini, "best" for calorimetry
else if( name == "QGSP_BERT" ) return new QGSP_BERT;
// param with Bertini
- else if( name == "LHEP_BERT" ) return new LHEP_BERT;
+ else if( name == "LHEP_BERT" ) return new LHEP_BERT;
// QGSP with binary cascade
- else if( name == "QGSP_BIC" ) return new QGSP_BIC;
+ else if( name == "QGSP_BIC" ) return new QGSP_BIC;
// didn't find it
else {
slic/src
diff -u -r1.11 -r1.12
--- PhysicsListManager.cc 18 Nov 2005 22:41:10 -0000 1.11
+++ PhysicsListManager.cc 5 Dec 2005 21:12:20 -0000 1.12
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/PhysicsListManager.cc,v 1.11 2005/11/18 22:41:10 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/PhysicsListManager.cc,v 1.12 2005/12/05 21:12:20 jeremy Exp $
#include "PhysicsListManager.hh"
// geant4
@@ -13,7 +13,13 @@
PhysicsListManager* PhysicsListManager::m_instance = 0;
// LCPhys is default
- const std::string PhysicsListManager::m_defaultListName = std::string( "LCPhys" );
+ const std::string PhysicsListManager::m_defaultListName =
+#ifdef SLIC_USE_LCPHYS
+ std::string( "LCPhys" )
+#else
+ std::string( "LHEP" )
+#endif
+ ;
PhysicsListManager::PhysicsListManager()
: Module("PhysicsListManager"),
@@ -32,7 +38,7 @@
void PhysicsListManager::setCurrentListName(const std::string& n)
{
- std::cout << "Setting physics list <" << n << ">." << std::endl;
+ std::cout << "Setting physics list <" << n << ">" << std::endl;
m_currentListName = n;
m_isFromDefault = false;
}
@@ -42,20 +48,20 @@
if ( !m_isInitialized ) {
if ( m_isFromDefault ) {
- std::cout << "Using default physics list <" << m_defaultListName << ">." << std::endl;
+ std::cout << "Using default physics list <" << m_defaultListName << ">" << std::endl;
}
// create list
m_currentList = PhysicsListFactory::create( m_currentListName );
G4RunManager::GetRunManager()->SetUserInitialization( m_currentList );
- std::cout << "Registered physics list <" << m_currentListName << "> with G4RunManager." << std::endl;
+ std::cout << "Registered physics list <" << m_currentListName << "> with G4RunManager" << std::endl;
m_isInitialized = true;
}
// called twice
else {
- std::cerr << "Ignoring additional call to PhysicsListManager::initializePhysics()." << std::endl;
+ std::cerr << "Ignoring additional call to PhysicsListManager::initializePhysics()" << std::endl;
}
}
@@ -64,7 +70,7 @@
if ( !m_setupLimits ) {
- std::cout << "Enabling user physics limits." << std::endl;
+ std::cout << "Enabling user physics limits" << std::endl;
G4ParticleTable* ptbl = G4ParticleTable::GetParticleTable();
@@ -91,7 +97,7 @@
4);
}
else {
- G4Exception( "G4ProcessManager is null!" );
+ G4Exception( "ERROR: G4ProcessManager is null!" );
}
}
CVSspam 0.2.8