diff -u -r1.9 -r1.10
--- GNUmakefile.local.in	6 Dec 2005 00:54:17 -0000	1.9
+++ GNUmakefile.local.in	15 Nov 2006 09:41:50 -0000	1.10
@@ -1,4 +1,4 @@

-# $Header: /cvs/lcd/slic/GNUmakefile.local.in,v 1.9 2005/12/06 00:54:17 jeremy Exp $

+# $Header: /cvs/lcd/slic/GNUmakefile.local.in,v 1.10 2006/11/15 09:41:50 jeremy Exp $

 #
 # Local build settings generated by configure
 #

@@ -50,3 +50,6 @@

 
 # Doxygen exec path for docs
 DOXYGEN        = @DOXYGEN@

+
+# Flag that CLHEP 2.x is being used.
+CLHEP_MAJOR_VERSION=@CLHEP_MAJOR_VERSION@

diff -u -r1.21 -r1.22
--- aclocal.m4	24 Jan 2006 18:39:10 -0000	1.21
+++ aclocal.m4	15 Nov 2006 09:41:51 -0000	1.22
@@ -1,4 +1,4 @@

-dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.21 2006/01/24 18:39:10 jeremy Exp $

+dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.22 2006/11/15 09:41:51 jeremy Exp $

 
 dnl
 dnl m4 configuration macros for SLIC and friends 

@@ -208,7 +208,14 @@

 
 AC_SUBST(CLHEP_PREFIX)
 

-dnl libs/includes will be setup by Geant4 binmake.

+dnl Define USE_CLHEP2 preprocessor
+dnl symbol if CLHEP 2 is found.
+CLHEP_MAJOR_VERSION=$($CLHEP_BASE_DIR/bin/clhep-config --version | awk '{print [$]2}' | sed -e 's/\.[[0-9]]*\.[[0-9]]*\.[[0-9]]*//')
+AC_SUBST(CLHEP_MAJOR_VERSION)
+if test "$CLHEP_MAJOR_VERSION" = "2"
+then
+  AC_DEFINE(USE_CLHEP2)
+fi

 
 ])
 

diff -u -r1.58 -r1.59
--- configure	14 Nov 2006 01:17:56 -0000	1.58
+++ configure	15 Nov 2006 09:41:52 -0000	1.59
@@ -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 enable_lcphys SLIC_PREFIX 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 CLHEP_MAJOR_VERSION XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX LCDD_PREFIX LCIO_PREFIX LCPHYS_PREFIX enable_lcphys SLIC_PREFIX DOXYGEN PACKAGE_AUTHORS PACKAGE_FULLNAME PACKAGE_INSTITUTION PACKAGE_DATE PACKAGE_WWW LIBOBJS LTLIBOBJS'

 ac_subst_files=''
 
 # Initialize some variables set by options.

@@ -2650,6 +2650,15 @@

+CLHEP_MAJOR_VERSION=$($CLHEP_BASE_DIR/bin/clhep-config --version | awk '{print $2}' | sed -e 's/\.[0-9]*\.[0-9]*\.[0-9]*//')
+
+if test "$CLHEP_MAJOR_VERSION" = "2"
+then
+  cat >>confdefs.h <<\_ACEOF
+#define USE_CLHEP2 1
+_ACEOF
+
+fi

@@ -3804,6 +3813,7 @@

 s,@G4WORKDIR@,$G4WORKDIR,;t t
 s,@G4SYSTEM@,$G4SYSTEM,;t t
 s,@CLHEP_PREFIX@,$CLHEP_PREFIX,;t t

+s,@CLHEP_MAJOR_VERSION@,$CLHEP_MAJOR_VERSION,;t t

 s,@XERCES_PREFIX@,$XERCES_PREFIX,;t t
 s,@XERCES_LIBNAME@,$XERCES_LIBNAME,;t t
 s,@GDML_PREFIX@,$GDML_PREFIX,;t t

diff -u -r1.5 -r1.6
--- GeneratorMessenger.cc	9 Dec 2005 01:58:34 -0000	1.5
+++ GeneratorMessenger.cc	15 Nov 2006 09:41:59 -0000	1.6
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/GeneratorMessenger.cc,v 1.5 2005/12/09 01:58:34 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/GeneratorMessenger.cc,v 1.6 2006/11/15 09:41:59 jeremy Exp $

 #include "GeneratorMessenger.hh"
 
 // slic

@@ -16,6 +16,8 @@

 #include "CLHEP/Random/Random.h"
 #include "CLHEP/Random/Randomize.h"
 

+using namespace CLHEP;
+

 namespace slic
 {
 

@@ -76,7 +78,11 @@

       }
 
       // seed it

+#ifdef USE_CLHEP2
+      Random::setTheSeed( seed );
+#else

       HepRandom::setTheSeed( seed );

+#endif

 
       G4cout << "set random seed: " << seed << G4endl;
     }