1 added + 11 modified, total 12 files
slic
diff -u -r1.23 -r1.24
--- GNUmakefile 16 Jul 2005 00:54:06 -0000 1.23
+++ GNUmakefile 7 Sep 2005 22:23:32 -0000 1.24
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/GNUmakefile,v 1.23 2005/07/16 00:54:06 jeremy Exp $
+# $Header: /cvs/lcd/slic/GNUmakefile,v 1.24 2005/09/07 22:23:32 jeremy Exp $
#
# Makefile for SLIC simulation package based on examples GNUmakefile by G. Cosmo.
#
@@ -13,8 +13,8 @@
# default target
.PHONY: all
-# create lib, bin, copy the lib and see that binary runs
-all: lib lib_copy bin test
+# create lib, bin, copy the lib and test that binary runs
+all: check_config lib lib_copy bin test
# local settings from running configure
include $(PWD)/GNUmakefile.local
@@ -58,7 +58,7 @@
$(error define LCIO=/path/to/LCIO)
endif
-# LCPhys
+# LCPhys
ifdef LCPHYS_BASE
include $(MAKEINCLUDES)/lcphys.gmk
else
@@ -71,12 +71,15 @@
# Geant4 binmake and special settings
include $(MAKEINCLUDES)/geant4.gmk
+# This file only exists if configure ran successfully.
+check_config: $(SLIC_BASE)/include/PackageInfo.hh
+
lib_copy:
@if [ ! -e $(G4WORKDIR)/lib ]; then mkdir $(G4WORKDIR)/lib; fi
@cp $(G4WORKDIR)/tmp/$(G4SYSTEM)/$(G4TARGET)/lib$(G4TARGET).* $(G4WORKDIR)/lib
# target to create Doxygen files
-docs:
+docs:
# check if Doxygen was found when configure ran
ifeq ($(strip $(DOXYGEN)),)
slic
diff -u -r1.10 -r1.11
--- aclocal.m4 4 Aug 2005 00:04:59 -0000 1.10
+++ aclocal.m4 7 Sep 2005 22:23:32 -0000 1.11
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/aclocal.m4,v 1.10 2005/08/04 00:04:59 jeremy Exp $
+# $Header: /cvs/lcd/slic/aclocal.m4,v 1.11 2005/09/07 22:23:32 jeremy Exp $
#
# local m4 macros for SLIC autoconf
#
@@ -463,13 +463,20 @@
AC_DEFUN(SIM_DEFINE_PACKAGE_VARS, [
-pkg_date=`date`
-AC_DEFINE_UNQUOTED(PACKAGE_DATE, "${pkg_date}")
-
-AC_DEFINE(PACKAGE_INSTITUTION, "SLAC")
-AC_DEFINE(PACKAGE_WWW, "http://www.lcsim.org/software/slic")
-AC_DEFINE(PACKAGE_FULLNAME, "Simulator for the Linear Collider")
-AC_DEFINE(PACKAGE_AUTHORS, "Jeremy McCormick and Ron Cassell")
+PACKAGE_DATE=$(date)
+PACKAGE_INSTITUTION="SLAC"
+PACKAGE_WWW="http://www.lcsim.org/software/slic"
+PACKAGE_FULLNAME="Simulator for the Linear Collider"
+PACKAGE_AUTHORS="Jeremy McCormick and Ron Cassell"
+
+AC_SUBST(PACKAGE_VERSION)
+AC_SUBST(PACKAGE_AUTHORS)
+AC_SUBST(PACKAGE_FULLNAME)
+AC_SUBST(PACKAGE_NAME)
+AC_SUBST(PACKAGE_INSTITUTION)
+AC_SUBST(PACKAGE_DATE)
+AC_SUBST(PACKAGE_WWW)
+AC_SUBST(PACKAGE_BUGREPORT)
])
slic
diff -u -r1.19 -r1.20
--- configure 7 Sep 2005 19:17:40 -0000 1.19
+++ configure 7 Sep 2005 22:23:32 -0000 1.20
@@ -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 GDML_PLATFORM GDML_SITE LCDD_PREFIX LCIO_PREFIX LCPHYS_PREFIX SLIC_PREFIX G4DEBUG_SET G4PROFILE_SET G4VERBOSE_SET SLIC_VERBOSE_SET DOXYGEN 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 GDML_PLATFORM GDML_SITE 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_files=''
# Initialize some variables set by options.
@@ -2491,34 +2491,6 @@
fi
-# define additional PACKAGE_ vars
-
-
-pkg_date=`date`
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_DATE "${pkg_date}"
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define PACKAGE_INSTITUTION "SLAC"
-_ACEOF
-
-cat >>confdefs.h <<\_ACEOF
-#define PACKAGE_WWW "http://www.lcsim.org/software/slic"
-_ACEOF
-
-cat >>confdefs.h <<\_ACEOF
-#define PACKAGE_FULLNAME "Simulator for the Linear Collider"
-_ACEOF
-
-cat >>confdefs.h <<\_ACEOF
-#define PACKAGE_AUTHORS "Jeremy McCormick and Ron Cassell"
-_ACEOF
-
-
-
-
# check for dependent packages
# set OS string
@@ -3154,17 +3126,39 @@
+# define additional PACKAGE_ vars
+
+
+PACKAGE_DATE=$(date)
+
+PACKAGE_INSTITUTION="SLAC"
+PACKAGE_WWW="http://www.lcsim.org/software/slic"
+PACKAGE_FULLNAME="Simulator for the Linear Collider"
+PACKAGE_AUTHORS="Jeremy McCormick and Ron Cassell"
+
+
+
+
+
+
+
+
+
+
+
+
# substitute DEFS and CXXFLAGS
# write out GNUmakefile.local with local settings
-MAKEFILES="
+config_files="
GNUmakefile.local
+ include/PackageInfo.hh
"
- ac_config_files="$ac_config_files ${MAKEFILES}"
+ ac_config_files="$ac_config_files ${config_files}"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -3715,7 +3709,7 @@
do
case "$ac_config_target" in
# Handling of arguments.
- "${MAKEFILES}" ) CONFIG_FILES="$CONFIG_FILES ${MAKEFILES}" ;;
+ "${config_files}" ) CONFIG_FILES="$CONFIG_FILES ${config_files}" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
@@ -3828,6 +3822,11 @@
s,@G4VERBOSE_SET@,$G4VERBOSE_SET,;t t
s,@SLIC_VERBOSE_SET@,$SLIC_VERBOSE_SET,;t t
s,@DOXYGEN@,$DOXYGEN,;t t
+s,@PACKAGE_AUTHORS@,$PACKAGE_AUTHORS,;t t
+s,@PACKAGE_FULLNAME@,$PACKAGE_FULLNAME,;t t
+s,@PACKAGE_INSTITUTION@,$PACKAGE_INSTITUTION,;t t
+s,@PACKAGE_DATE@,$PACKAGE_DATE,;t t
+s,@PACKAGE_WWW@,$PACKAGE_WWW,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
slic
diff -u -r1.17 -r1.18
--- configure.ac 7 Sep 2005 19:17:40 -0000 1.17
+++ configure.ac 7 Sep 2005 22:23:32 -0000 1.18
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/configure.ac,v 1.17 2005/09/07 19:17:40 jeremy Exp $
+# $Header: /cvs/lcd/slic/configure.ac,v 1.18 2005/09/07 22:23:32 jeremy Exp $
#
# Process this file with autoconf to produce a configure script for SLIC.
#
@@ -33,9 +33,6 @@
#AC_PROG_INSTALL
AC_PROG_MAKE_SET
-# define additional PACKAGE_ vars
-SIM_DEFINE_PACKAGE_VARS()
-
# check for dependent packages
# set OS string
@@ -78,17 +75,21 @@
# Set VERSION file
SIM_CREATE_VERSION_FILE()
+# define additional PACKAGE_ vars
+SIM_DEFINE_PACKAGE_VARS()
+
# substitute DEFS and CXXFLAGS
AC_SUBST([CXXFLAGS])
AC_SUBST([CPPFLAGS])
AC_SUBST([DEFS])
# write out GNUmakefile.local with local settings
-MAKEFILES="
+config_files="
GNUmakefile.local
+ include/PackageInfo.hh
"
-AC_CONFIG_FILES(${MAKEFILES})
+AC_CONFIG_FILES(${config_files})
AC_OUTPUT()
# completion mesg
slic/include
diff -N PackageInfo.hh.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ PackageInfo.hh.in 7 Sep 2005 22:23:33 -0000 1.1
@@ -0,0 +1,69 @@
+namespace slic
+{
+
+ class PackageInfo
+ {
+
+ public:
+
+ static std::string& getVersionString()
+ {
+ static std::string ver_str = "@PACKAGE_VERSION@";
+ return ver_str;
+ }
+
+ static std::string& getAuthorString()
+ {
+ static std::string auth_str = "@PACKAGE_AUTHORS@";
+ return auth_str;
+ }
+
+ static std::string& getNameString()
+ {
+ static std::string name_str = "@PACKAGE_FULLNAME@";
+ return name_str;
+ }
+
+ static std::string& getAbbrevString()
+ {
+ static std::string abbrev_str = "@PACKAGE_NAME@";
+ return abbrev_str;
+ }
+
+ static std::string& getInstitutionString()
+ {
+ static std::string inst_str = "@PACKAGE_INSTITUTION@";
+ return inst_str;
+ }
+
+ static std::string& getChangeDateString()
+ {
+ static std::string inst_str = "@PACKAGE_DATE@";
+ return inst_str;
+ }
+
+ static std::string& getWWW()
+ {
+ static std::string www_str = "@PACKAGE_WWW@";
+ return www_str;
+ }
+
+ static std::string& getEmail()
+ {
+ static std::string email_str = "@PACKAGE_BUGREPORT@";
+ return email_str;
+ }
+
+ static std::string getFullApplicationString()
+ {
+ static std::string fullVerStr =
+ getNameString() + "; "
+ + getAbbrevString() + "; "
+ + getVersionString() + "; "
+ + getAuthorString() + "; "
+ + getInstitutionString() + "; "
+ + getChangeDateString();
+ return fullVerStr;
+ }
+ };
+}
slic/include
diff -u -r1.29 -r1.30
--- G4Application.hh 7 Sep 2005 18:40:37 -0000 1.29
+++ G4Application.hh 7 Sep 2005 22:23:33 -0000 1.30
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/G4Application.hh,v 1.29 2005/09/07 18:40:37 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/G4Application.hh,v 1.30 2005/09/07 22:23:33 jeremy Exp $
#ifndef slic_G4Application_hh
#define slic_G4Application_hh 1
@@ -78,48 +78,48 @@
}
// application ID strings to be overridden in user app
- virtual const std::string& getVersionString() const
- {
- return StringUtil::NULL_STR;
- }
-
- virtual const std::string& getAuthorString() const
- {
- return StringUtil::NULL_STR;
- }
-
- virtual const std::string& getNameString() const
- {
- return StringUtil::NULL_STR;
- }
-
- virtual const std::string& getAbbrevString() const
- {
- return StringUtil::NULL_STR;
- }
-
- virtual const std::string& getInstitutionString() const
- {
- return StringUtil::NULL_STR;
- }
+ // virtual const std::string& getVersionString() const
+ // {
+ // return StringUtil::NULL_STR;
+ // }
+
+ // virtual const std::string& getAuthorString() const
+ // {
+ // return StringUtil::NULL_STR;
+ // }
+
+ // virtual const std::string& getNameString() const
+ // {
+ // return StringUtil::NULL_STR;
+ // }
+
+ // virtual const std::string& getAbbrevString() const
+ // {
+ // return StringUtil::NULL_STR;
+ // }
+
+ // virtual const std::string& getInstitutionString() const
+ // {
+ // return StringUtil::NULL_STR;
+ // }
// app should return CVS Date keyword
- virtual const std::string& getChangeDateString() const
- {
- return StringUtil::NULL_STR;
- }
+ // virtual const std::string& getChangeDateString() const
+ // {
+ // return StringUtil::NULL_STR;
+ // }
+
+ // virtual const std::string& getWWW() const
+ // {
+ // return StringUtil::NULL_STR;
+ // }
+
+ // virtual const std::string& getEmail() const
+ // {
+ // return StringUtil::NULL_STR;
+ // }
- virtual const std::string& getWWW() const
- {
- return StringUtil::NULL_STR;
- }
-
- virtual const std::string& getEmail() const
- {
- return StringUtil::NULL_STR;
- }
-
- std::string getFullApplicationString() const;
+ // std::string getFullApplicationString() const;
void printSplashScreen(std::ostream& os) const;
@@ -143,17 +143,6 @@
ERunMode getMode() const;
- // non-virtual setup functions
- void initializeDefaultSetup();
- void initializeUI();
-
-#ifdef G4VIS_USE
- void initializeVis();
-#endif
- void initializeRunManager();
-
- void initializeMaterialScanner();
-
void setAborting(bool a = true)
{
if ( a ) {
@@ -175,6 +164,20 @@
// print end time
static void printEndTime(std::ostream& os);
+ private:
+
+ // non-virtual setup functions
+ void initializeDefaultSetup();
+ void initializeUI();
+
+#ifdef G4VIS_USE
+ void initializeVis();
+#endif
+
+ void initializeRunManager();
+
+ void initializeMaterialScanner();
+
protected:
// instance
slic/include
diff -u -r1.27 -r1.28
--- SlicApplication.hh 4 Aug 2005 00:04:59 -0000 1.27
+++ SlicApplication.hh 7 Sep 2005 22:23:33 -0000 1.28
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/SlicApplication.hh,v 1.27 2005/08/04 00:04:59 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/SlicApplication.hh,v 1.28 2005/09/07 22:23:33 jeremy Exp $
#ifndef slic_SlicApplication_hh
#define slic_SlicApplication_hh 1
@@ -33,53 +33,53 @@
virtual void registerCmdLineOpts();
- virtual const std::string& getVersionString() const
- {
- static const std::string ver_str = PACKAGE_VERSION;
- return ver_str;
- }
-
- virtual const std::string& getAuthorString() const
- {
- static const std::string auth_str = PACKAGE_AUTHORS;
- return auth_str;
- }
-
- virtual const std::string& getNameString() const
- {
- static const std::string name_str = PACKAGE_FULLNAME;
- return name_str;
- }
-
- virtual const std::string& getAbbrevString() const
- {
- static const std::string abbrev_str = PACKAGE_NAME;
- return abbrev_str;
- }
-
- virtual const std::string& getInstitutionString() const
- {
- static const std::string inst_str = PACKAGE_INSTITUTION;
- return inst_str;
- }
-
- virtual const std::string& getChangeDateString() const
- {
- static const std::string inst_str = PACKAGE_DATE;
- return inst_str;
- }
-
- virtual const std::string& getWWW() const
- {
- static const std::string www_str = PACKAGE_WWW;
- return www_str;
- }
-
- virtual const std::string& getEmail() const
- {
- static const std::string email_str = PACKAGE_BUGREPORT;
- return email_str;
- }
+ // virtual const std::string& getVersionString() const
+ // {
+ // static const std::string ver_str = PACKAGE_VERSION;
+ // return ver_str;
+ // }
+
+ // virtual const std::string& getAuthorString() const
+ // {
+ // static const std::string auth_str = PACKAGE_AUTHORS;
+ // return auth_str;
+ // }
+
+ // virtual const std::string& getNameString() const
+ // {
+ // static const std::string name_str = PACKAGE_FULLNAME;
+ // return name_str;
+ // }
+
+ // virtual const std::string& getAbbrevString() const
+ // {
+ // static const std::string abbrev_str = PACKAGE_NAME;
+ // return abbrev_str;
+ // }
+
+ // virtual const std::string& getInstitutionString() const
+ // {
+ // static const std::string inst_str = PACKAGE_INSTITUTION;
+ // return inst_str;
+ // }
+
+ // virtual const std::string& getChangeDateString() const
+ // {
+ // static const std::string inst_str = PACKAGE_DATE;
+ // return inst_str;
+ // }
+
+ // virtual const std::string& getWWW() const
+ // {
+ // static const std::string www_str = PACKAGE_WWW;
+ // return www_str;
+ // }
+
+ // virtual const std::string& getEmail() const
+ // {
+ // static const std::string email_str = PACKAGE_BUGREPORT;
+ // return email_str;
+ // }
virtual void printOutMacroCommands(std::ostream& os);
slic/src
diff -u -r1.44 -r1.45
--- G4Application.cc 7 Sep 2005 18:40:39 -0000 1.44
+++ G4Application.cc 7 Sep 2005 22:23:33 -0000 1.45
@@ -1,8 +1,10 @@
-// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.44 2005/09/07 18:40:39 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.45 2005/09/07 22:23:33 jeremy Exp $
#include "G4Application.hh"
// SLIC
+#include "PackageInfo.hh"
+
// managers to init
#include "G4ApplicationMessenger.hh"
#include "LcioManager.hh"
@@ -286,15 +288,15 @@
CmdManager::instance()->getCmdRegistry()->printOut( os );
}
- std::string G4Application::getFullApplicationString() const
- {
- return getNameString() + "; "
- + getAbbrevString() + "; "
- + getVersionString() + "; "
- + getAuthorString() + "; "
- + getInstitutionString() + "; "
- + getChangeDateString();
- }
+ // std::string G4Application::getFullApplicationString() const
+ // {
+ // return getNameString() + "; "
+ // + getAbbrevString() + "; "
+ // + getVersionString() + "; "
+ // + getAuthorString() + "; "
+ // + getInstitutionString() + "; "
+ // + getChangeDateString();
+ // }
void G4Application::printSplashScreen(std::ostream& os) const
{
@@ -302,13 +304,13 @@
// splash screen
os << "*************************************************************" << std::endl;
- os << " App : " << getNameString() << " (" << getAbbrevString() << ")" << std::endl;
- os << " Version : " << getVersionString() << std::endl;
- os << " Date : " << getChangeDateString() << std::endl;
- os << " Authors : " << getAuthorString() << std::endl;
- os << " Inst : " << getInstitutionString() << std::endl;
- os << " WWW : " << getWWW() << std::endl;
- os << " Contact : " << getEmail() << std::endl;
+ os << " App : " << PackageInfo::getNameString() << " (" << PackageInfo::getAbbrevString() << ")" << std::endl;
+ os << " Version : " << PackageInfo::getVersionString() << std::endl;
+ os << " Date : " << PackageInfo::getChangeDateString() << std::endl;
+ os << " Authors : " << PackageInfo::getAuthorString() << std::endl;
+ os << " Inst : " << PackageInfo::getInstitutionString() << std::endl;
+ os << " WWW : " << PackageInfo::getWWW() << std::endl;
+ os << " Contact : " << PackageInfo::getEmail() << std::endl;
os << "*************************************************************" << std::endl;
os << std::endl;
}
@@ -324,5 +326,4 @@
{
os << "End Time <" << TimeUtil::getAscTime() << ">" << std::endl;
}
-
};
slic/src
diff -u -r1.7 -r1.8
--- LcioFileNamer.cc 15 Jul 2005 23:24:35 -0000 1.7
+++ LcioFileNamer.cc 7 Sep 2005 22:23:33 -0000 1.8
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioFileNamer.cc,v 1.7 2005/07/15 23:24:35 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioFileNamer.cc,v 1.8 2005/09/07 22:23:33 jeremy Exp $
#include "LcioFileNamer.hh"
// LCDD
@@ -8,6 +8,7 @@
// SLIC
#include "G4Application.hh"
+#include "PackageInfo.hh"
#include "EventSourceManager.hh"
namespace slic
@@ -18,10 +19,10 @@
std::string LcioFileNamer::makeFullFilename()
{
// app abbreviation
- std::string abbrev = G4Application::instance()->getAbbrevString();
+ std::string abbrev = PackageInfo::getAbbrevString();
// app version
- std::string ver = G4Application::instance()->getVersionString();
+ std::string ver = PackageInfo::getVersionString();
// geom name
std::string geo = LCDDProcessor::instance()->getDetectorName();
slic/src
diff -u -r1.58 -r1.59
--- LcioManager.cc 31 Aug 2005 19:38:57 -0000 1.58
+++ LcioManager.cc 7 Sep 2005 22:23:33 -0000 1.59
@@ -1,10 +1,10 @@
-// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.58 2005/08/31 19:38:57 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.59 2005/09/07 22:23:33 jeremy Exp $
#include "LcioManager.hh"
// SLIC
#include "FileUtil.hh"
#include "TimeUtil.hh"
-
+#include "PackageInfo.hh"
#include "LcioMessenger.hh"
#include "LcioMcpManager.hh"
#include "LcioFileNamer.hh"
@@ -248,8 +248,7 @@
m_runHdr = new LCRunHeaderImpl();
// set app string in run header
- G4Application* app = G4Application::instance();
- m_runHdr->parameters().setValue( "APP_STRING", app->getFullApplicationString() );
+ m_runHdr->parameters().setValue( "APP_STRING", PackageInfo::getFullApplicationString() );
// set run number
m_runHdr->setRunNumber( m_runNumber );
slic/src
diff -u -r1.34 -r1.35
--- SlicApplication.cc 6 Sep 2005 23:08:16 -0000 1.34
+++ SlicApplication.cc 7 Sep 2005 22:23:34 -0000 1.35
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/SlicApplication.cc,v 1.34 2005/09/06 23:08:16 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/SlicApplication.cc,v 1.35 2005/09/07 22:23:34 jeremy Exp $
#include "SlicApplication.hh"
// SLIC
@@ -154,14 +154,6 @@
1);
cmd_mgr->addCmd(cmd_exec, "/control/execute" );
- // do init
- // CmdLineOpt* cmd_init = new CmdLineOpt("z",
- // "initialize",
- // "Initialize the simulator.",
- // 0,
- // 0);
- // cmd_mgr->addCmd(cmd_init, "/run/initialize");
-
// set LCDD URI
CmdLineOpt* cmd_lcddURL = new CmdLineOpt("g",
"lcdd-url",
slic/src
diff -u -r1.7 -r1.8
--- SlicMessenger.cc 20 Apr 2005 00:11:23 -0000 1.7
+++ SlicMessenger.cc 7 Sep 2005 22:23:34 -0000 1.8
@@ -1,7 +1,8 @@
-// $Header: /cvs/lcd/slic/src/SlicMessenger.cc,v 1.7 2005/04/20 00:11:23 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/SlicMessenger.cc,v 1.8 2005/09/07 22:23:34 jeremy Exp $
#include "SlicMessenger.hh"
#include "SlicApplication.hh"
+#include "PackageInfo.hh"
namespace slic
{
@@ -19,7 +20,7 @@
void SlicMessenger::SetNewValue(G4UIcommand* cmd, G4String)
{
if ( cmd == m_slicVersion ) {
- std::cout << std::endl << m_app->getFullApplicationString() << std::endl << std::endl;
+ std::cout << std::endl << PackageInfo::getFullApplicationString() << std::endl << std::endl;
}
else if ( cmd == m_slicUsage ) {
m_app->printOutUsage( std::cout );
CVSspam 0.2.8