5 modified files
slic
diff -u -r1.23 -r1.24
--- aclocal.m4 27 Apr 2007 01:53:51 -0000 1.23
+++ aclocal.m4 12 Jul 2007 18:11:36 -0000 1.24
@@ -1,4 +1,4 @@
-dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.23 2007/04/27 01:53:51 jeremy Exp $
+dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.24 2007/07/12 18:11:36 jeremy Exp $
dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
dnl Autoconf macros for SLIC and its dependencies friends.
@@ -151,6 +151,20 @@
])
+dnl Macro to check whether NIST is supported by the current Geant4 version
+AC_DEFUN(AC_HAVE_G4NIST, [
+
+AC_MSG_CHECKING(for G4NistManager.hh)
+
+if test -e $G4INSTALL/source/materials/include/G4NistManager.hh; then
+ AC_DEFINE(HAVE_G4NIST)
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+
+])
+
dnl /\/\/\ Geant4 /\/\/\
AC_DEFUN(SIM_SETUP_G4, [
slic
diff -u -r1.81 -r1.82
--- configure 3 Jul 2007 18:05:30 -0000 1.81
+++ configure 12 Jul 2007 18:11:36 -0000 1.82
@@ -3276,6 +3276,24 @@
+
+echo "$as_me:$LINENO: checking whether to enable Geant4 NIST service" >&5
+echo $ECHO_N "checking whether to enable Geant4 NIST service... $ECHO_C" >&6
+
+if test -e $G4INSTALL/source/materials/include/G4NistManager.hh; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_G4NIST 1
+_ACEOF
+
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+
# CLHEP
slic
diff -u -r1.72 -r1.73
--- configure.ac 3 Jul 2007 18:05:30 -0000 1.72
+++ configure.ac 12 Jul 2007 18:11:36 -0000 1.73
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/configure.ac,v 1.72 2007/07/03 18:05:30 jeremy Exp $
+# $Header: /cvs/lcd/slic/configure.ac,v 1.73 2007/07/12 18:11:36 jeremy Exp $
#
# Process this file with autoconf to produce a configure script for SLIC.
#
@@ -38,53 +38,54 @@
# check for dependent packages
# set OS string
-CHECK_OS()
+CHECK_OS
# Check whether to rewrite include/PackageInfo.hh
-SIM_ENABLE_PACKAGE_INFO()
+SIM_ENABLE_PACKAGE_INFO
# Setup Default CPPFLAGS
-SIM_SETUP_DEF_CPPFLAGS()
+SIM_SETUP_DEF_CPPFLAGS
# G4
-SIM_SETUP_G4()
+SIM_SETUP_G4
+AC_HAVE_G4NIST
# CLHEP
-SIM_SETUP_CLHEP()
+SIM_SETUP_CLHEP
# Xerces
-SIM_SETUP_XERCES()
-SIM_WITH_XERCES_LIBNAME()
+SIM_SETUP_XERCES
+SIM_WITH_XERCES_LIBNAME
# GDML
-SIM_SETUP_GDML()
+SIM_SETUP_GDML
# LCDD
-SIM_SETUP_LCDD()
+SIM_SETUP_LCDD
# LCIO
-SIM_SETUP_LCIO()
+SIM_SETUP_LCIO
# LCPhys enable
-SIM_ENABLE_LCPHYS()
+SIM_ENABLE_LCPHYS
# LCPhys
-SIM_SETUP_LCPHYS()
+SIM_SETUP_LCPHYS
# SLIC
-SIM_SETUP_SLIC()
+SIM_SETUP_SLIC
# possible option for verbose compiler output
-SIM_SETUP_VERBOSE_COMPILE()
+SIM_SETUP_VERBOSE_COMPILE
# Doxygen
-SIM_SETUP_DOXYGEN()
+SIM_SETUP_DOXYGEN
# Set VERSION file
-SIM_CREATE_VERSION_FILE()
+SIM_CREATE_VERSION_FILE
# define additional PACKAGE_ vars
-SIM_DEFINE_PACKAGE_VARS()
+SIM_DEFINE_PACKAGE_VARS
# substitute DEFS and CXXFLAGS
AC_SUBST([CXXFLAGS])
@@ -105,7 +106,7 @@
fi
AC_CONFIG_FILES(${config_files})
-AC_OUTPUT()
+AC_OUTPUT
# completion mesg
echo "Done."
slic/config/doxygen
diff -u -r1.11 -r1.12
--- slic_doxygen.cfg 29 Jun 2007 22:40:53 -0000 1.11
+++ slic_doxygen.cfg 12 Jul 2007 18:11:37 -0000 1.12
@@ -1,5 +1,5 @@
PROJECT_NAME = "Simulator for the Linear Collider"
-PROJECT_NUMBER = v2r2p3
+PROJECT_NUMBER = v2r3p1
OUTPUT_DIRECTORY = $(SLIC_BASE)/doc
OUTPUT_LANGUAGE = English
BRIEF_MEMBER_DESC = YES
slic/src
diff -u -r1.43 -r1.44
--- SlicApplication.cc 20 Jun 2007 00:02:10 -0000 1.43
+++ SlicApplication.cc 12 Jul 2007 18:11:37 -0000 1.44
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/SlicApplication.cc,v 1.43 2007/06/20 00:02:10 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/SlicApplication.cc,v 1.44 2007/07/12 18:11:37 jeremy Exp $
#include "SlicApplication.hh"
@@ -26,7 +26,10 @@
// lcdd
#include "LCDDDetectorConstruction.hh"
+
+#ifdef HAVE_G4NIST
#include "NistWriterMessenger.hh"
+#endif
// geant4
#include "G4ApplicationState.hh"
@@ -148,8 +151,10 @@
// Setup the LCDD subsystem.
initializeLCDD();
+#ifdef HAVE_G4NIST
// Setup the NIST Writer.
initializeNistWriter();
+#endif
// Construct and register the UserAction classes.
initializeUserActions();
@@ -353,9 +358,11 @@
CommandLineProcessor::instance()->printUsage();
}
+#ifdef HAVE_G4NIST
void SlicApplication::initializeNistWriter()
{
new NistWriterMessenger();
}
+#endif
} // namespace slic
CVSspam 0.2.8