6 modified files
slic
diff -u -r1.15 -r1.16
--- GNUmakefile.local.in 29 Jun 2011 21:43:41 -0000 1.15
+++ GNUmakefile.local.in 9 Apr 2013 21:24:09 -0000 1.16
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/GNUmakefile.local.in,v 1.15 2011/06/29 21:43:41 jeremy Exp $
+# $Header: /cvs/lcd/slic/GNUmakefile.local.in,v 1.16 2013/04/09 21:24:09 jeremy Exp $
#
# Local build settings generated by configure
#
@@ -22,13 +22,16 @@
G4INSTALL = @G4_PREFIX@
G4SYSTEM = @G4SYSTEM@
G4WORKDIR = @G4WORKDIR@
+GEANT4_VERSION = @[log in to unmask]@[log in to unmask]@GEANT4_PATCH_VERSION@
+G4LIB = $(G4INSTALL)/lib64/Geant4-$(GEANT4_VERSION)
+#@echo "G4LIB=$(G4LIB)"
# Geant4 library build settings.
G4LIB_BUILD_SHARED = @G4LIB_BUILD_SHARED@
G4LIB_BUILD_STATIC = @G4LIB_BUILD_STATIC@
# CLHEP base dir
-CLHEP_BASE_DIR = @CLHEP_PREFIX@
+#CLHEP_BASE_DIR = @CLHEP_PREFIX@
# LCDD base dir
LCDD_BASE = @LCDD_PREFIX@
@@ -54,7 +57,7 @@
DOXYGEN = @DOXYGEN@
# Flag that CLHEP 2.x is being used.
-CLHEP_MAJOR_VERSION=@CLHEP_MAJOR_VERSION@
+#CLHEP_MAJOR_VERSION=@CLHEP_MAJOR_VERSION@
# Setup dynamic load variable.
# FIXME: Needs to be different for Cygwin and OSX.
slic
diff -u -r1.45 -r1.46
--- aclocal.m4 3 Aug 2012 02:00:47 -0000 1.45
+++ aclocal.m4 9 Apr 2013 21:24:09 -0000 1.46
@@ -1,4 +1,4 @@
-]dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.45 2012/08/03 02:00:47 jeremy Exp $
+]dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.46 2013/04/09 21:24:09 jeremy Exp $
dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
dnl Autoconf macros for SLIC and its dependencies.
@@ -336,11 +336,11 @@
[LCDD_PREFIX=$with_lcdd])
if test -z "${with_lcdd}"; then
- if test -n "$LCDD_BASE"; then dnl env
+ if test -n "$LCDD_BASE"; then
LCDD_PREFIX=${LCDD_BASE}
else
AC_MSG_RESULT(no)
- AC_MSG_ERROR(LCDD installation was not found) dnl not found
+ AC_MSG_ERROR(LCDD installation was not found)
fi
fi
slic
diff -u -r1.150 -r1.151
--- configure.ac 14 Aug 2012 19:44:41 -0000 1.150
+++ configure.ac 9 Apr 2013 21:24:09 -0000 1.151
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/configure.ac,v 1.150 2012/08/14 19:44:41 jeremy Exp $
+# $Header: /cvs/lcd/slic/configure.ac,v 1.151 2013/04/09 21:24:09 jeremy Exp $
#
# Process this file with autoconf to produce a configure script for SLIC.
#
@@ -54,7 +54,7 @@
AC_GEANT4_PHYSLISTS
dnl CLHEP
-SIM_SETUP_CLHEP
+dnl SIM_SETUP_CLHEP
dnl Xerces
SIM_SETUP_XERCES
slic/config/make
diff -u -r1.3 -r1.4
--- geant4.gmk 6 Dec 2005 00:54:18 -0000 1.3
+++ geant4.gmk 9 Apr 2013 21:24:10 -0000 1.4
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/config/make/geant4.gmk,v 1.3 2005/12/06 00:54:18 jeremy Exp $
+# $Header: /cvs/lcd/slic/config/make/geant4.gmk,v 1.4 2013/04/09 21:24:10 jeremy Exp $
#
# Geant4 make fragment
@@ -11,11 +11,18 @@
CPPFLAGS += -DG4UI_USE_TERMINAL
endif
+ # CLHEP headers
+ CPPFLAGS += -I$(G4INSTALL)/source/externals/clhep/include/
+
+ export GLOBALLIBS = yes
+ export G4VIS_NONE = yes
+ export G4LIB_USE_CLHEP = yes
+
include $(G4INSTALL)/config/binmake.gmk
# extra libs for static linking
- LOADLIBS += -lCLHEP
- EXTRALIBS += -lCLHEP
+ #LOADLIBS += -lCLHEP
+ #EXTRALIBS += -lCLHEP
else
$(error define G4INSTALL=/path/to/geant4)
slic/src
diff -u -r1.7 -r1.8
--- LCOpticalPhysics.cc 27 Nov 2012 19:32:19 -0000 1.7
+++ LCOpticalPhysics.cc 9 Apr 2013 21:24:10 -0000 1.8
@@ -52,8 +52,8 @@
theScintillationProcess->SetScintillationYieldFactor(1.);
// theScintillationProcess->SetTrackSecondariesFirst(true);
- G4OpticalSurfaceModel themodel = unified;
- theBoundaryProcess->SetModel(themodel);
+ //G4OpticalSurfaceModel themodel = unified;
+ //theBoundaryProcess->SetModel(themodel);
theParticleIterator->reset();
CVSspam 0.2.12