Import Geant4 6.0.1 source tree

Author: gcosmo

Configure

@@ -18,9 +18,9 @@
 # you may fetch it yourself from your nearest archive site.)
 #
 
-# $Id: Configure,v 1.48 2003/12/12 15:02:51 stesting Exp $
+# $Id: Configure,v 1.49 2004/02/09 14:58:45 stesting Exp $
 #
-# Generated on Fri Dec 12 15:49:38 CET 2003 [metaconfig 3.0 PL70]
+# Generated on Mon Feb  9 15:57:09 CET 2004 [metaconfig 3.0 PL70]
 
 cat >/tmp/c1$$ <<EOF
 WARNING!!!!!
@@ -3101,6 +3101,8 @@ gans=$ans
 	case $gans in
 	
 	n*|N*) 
+		g4lib_build_shared=n
+		g4lib_build_static=y
 		break
 		;;
 	y*|Y*) 
@@ -3134,14 +3136,16 @@ You selected to build 'shared' (.so) libraries.
 Do you want to build 'static' (.a) libraries too?
 EOM`
 
-dflt=$g4lib_build_static
+#dflt=$g4lib_build_static
+dflt=n
 rp=$g4message
 . ./myread
 gans=$ans
 
 	case $gans in
 	
 	n*|N*) 
+		g4lib_build_static=n
 		break
 		;;
 	y*|Y*) 

ReleaseNotes/Patch4.6.0-1.txt

@@ -0,0 +1,153 @@
+
+                 Geant4 6.0 - patch-01 Release Notes
+                 -----------------------------------
+
+                                                           11 February 2004
+
+List of fixes included in this public patch since release 6.0:
+
+  o Configuration:
+    -------------
+    + Configure:
+      o Corrected defaults for shared-libs build.
+    + architecture.gmk:
+      o Protect OGLFLAGS against containing include path to /usr/include.
+        This may cause wrong includes to be picked up.
+    + Darwin-g++.gmk:
+      o Adopt "g++" as the default as compiler.
+      o Corrected procedure for building .dylib shared libs.
+        Previous default Linux commands do not work on MacOSX.
+
+  o Geometry:
+    --------
+    + magneticfield:
+      o G4UniformMagField: added missing implementation for
+        GetConstantFieldValue(). Fixes bug report #575.
+    + navigation:
+      o Modified G4PropagatorInField::ReEstimateEndpoint() to cope with
+        a failure of AccurateAdvance(), by calling it iteratively up maximum
+        20 times.
+      o Fix in G4PropagatorInField::SetVerboseLevel(): now forwarding the
+        verbosity to integration driver.
+    + solids/CSG:
+      o Converted strong exceptions in warning notifications for rare
+        anomalous conditions in DistanceToOut(p,v,..).
+      o G4Cons: bug fix in DistanceToIn(p,v) to resolve situations of calls
+        to DistanceToOut() for points outside.
+    + solids/specific:
+      o G4PolyhedraSide: fixed bug in which particles could "leak" out the
+        center of a face if inner radius = 0. Fixes problem report #547.
+    + volumes:
+      o G4AssemblyVolume: fixed initial value for 'numberOfDaughters' of
+        imprinted volumes copy-numbers. Fixes problem report #566.
+
+  o Global:
+    ------
+    + G4UnitsTable: corrected signatures to consider 'const G4String&'
+      wherever applicable.
+
+  o Materials:
+    ---------
+    + G4Material: proper STL handling of 'theElementVector'.
+    + Fixed problem in destructor of G4SandiaTable.
+
+  o Particles:
+    ---------
+    + Fixed initialization problems in G4NuclearPropertiesTable:
+      o Added initialization of 'indexArray'.
+      o Removed internal static member 'theInstance'.
+
+  o Electromagnetic low-energy processes:
+    ------------------------------------
+    + Fixed memory leaks in G4PenelopeInterpolator and G4PenelopeIonisation.
+
+  o Electromagnetic standard processes:
+    ----------------------------------
+    + standard:
+      o Minor fixes in G4PAIonisation and G4PAIModel.
+    + utils:
+      o Activated precise range calculation.
+      o Added Set methods to G4LossTablemanager to define: binning,
+        'maxEnergy' for muon tables, 'maxEnergy' for precise range.
+      o Fixed problem in destruction of PAI model.
+      o Fixed bug responsible for problems in cross section of
+        delta-electron production from muons.
+
+  o Hadronic Processes:
+    ------------------
+    + management:
+      o Fix for suspended particles. Solves a problem seen in neutron_hp
+        elastic scattering.
+    + chiral_inv_phase_space:
+      o Porting of experimental interface classes.
+      o Provided implementation of missing cases which was cause of 
+        crashes in ATLAS production.
+    + neutron_hp:
+      o Fixed conflict with system variable name.
+    + parton_string:
+      o Lower bound added to transverse mass distribution, to enable
+        diffractive scattering for gammas. Was cause of a crash in ATLAS
+        productions.
+
+  o Optical processes:
+    -----------------
+    + Fix in the initialization of the G4OpBoundaryProcessStatus at the 
+      beginning of its DoIt(), now set to "Undefined". This should allow
+      a user to correctly get the process flag from the UserSteppingAction()
+      through the public function G4OpBoundaryProcess::GetStatus()
+      even when the (forced) DoIt() was called when the optical photon
+      track was not at a boundary, or when medium1 == medium2.
+
+  o Parameterised processes:
+    -----------------------
+    + G4FastSimulationVector: use std_pvector:: scope for calls to
+      base class. Fixes compilation problem on Intel-icc compiler.
+
+  o Transportation processes:
+    ------------------------
+    + Fixed a bug in G4UserSpecialCuts related to 'charged-geantino'.
+
+  o Run:
+    ---
+    + Updated date to run-manager.
+
+  o Track:
+    -----
+    + G4VParticleChange: removed unnecessary 'const' qualifier to return
+      value in GetAccuracyForWarning() and GetAccuracyForException()
+      causing noisy compilation warnings on Intel-icc compiler.
+
+  o Visualization:
+    -------------
+    + management:
+      o Fixed compilation problems on Intel-icc compiler. Added missing
+        forward declaration of G4VisStateDependent to G4VisManager. 
+    + HepRep:
+      o Fixed handling of symbols zcalloc and zcfree of the zlib library
+        being called as C++ mangled names. 
+      o Renamed zutil.h, zlib.h and zconf.h into HepRep-zutil.h, ... to
+        avoid conflicts with those files on Unix systems if /usr/include
+        or /usr/local/include is on the include search path.
+      o Fixed compilation problems on Intel-icc compiler.
+
+  o Examples:
+    --------
+    + Updated reference outputs.
+    + extended/analysis/A01
+      o Fixed physics lists for EM processes.
+
+ ----------------------------------------------------------------------------
+
+                             Technical Notes
+                             --------------- 
+
+  o  This patch should be applied on top of release 6.0.
+  o  Technical notes distributed for release 6.0 are also applicable and
+     valid for this patch.
+
+The code and rebuilt binary libraries for release 6.0 are available through
+our "Source Code" Web page:  http://cern.ch/geant4
+
+Please refer to the Geant4 User Documentation:
+   http://cern.ch/geant4/G4UsersDocuments/Overview/html
+for further information about using Geant4.

ReleaseNotes/ReleaseNotes4.6.0.html

@@ -201,14 +201,14 @@ <H3><I>Geometry</I></H3>
     its mother physical volume during the navigation, it is now required to
     adopt <I>touchables</I> through the pre/post-step point.<BR>
     Examples on how to do this are provided in the
-    <A TARGET="ext" HREF="http://cern.ch/geant4/support/faq.html#a-geom-3">FAQ page</A></LI>
+    <A TARGET="ext" HREF="http://geant4.web.cern.ch/geant4/support/faq.html#a-geom-3">FAQ page</A></LI>
 <LI>Inherited user-defined physical volumes will have to adapt to the
     new interface by removing the method <TT>Setup()</TT>, now no longer
     required.</LI>
 <LI>A revision of methods in <TT>G4Navigator</TT> has taken place, some
     obsolete methods not used and available in the public interface have been
     removed, others originally meant for internal use have been moved
-    to <TT>protected</TT> (see <A HREF=#geo-notes">notes</A> for details).<BR>
+    to <TT>protected</TT> (see <A HREF="#geo-notes">notes</A> for details).<BR>
     <TT>LocateGlobalPointAndSetup(p,v,history)</TT> has been renamed to
     <TT>ResetHistoryAndLocate(p,v,history)</TT>.</LI>
 <LI>A revision of the inclusion of header files has been done in all
@@ -219,7 +219,7 @@ <H3><I>Geometry</I></H3>
 <LI>Internal modules in the geometry have been reorganised. External
     frameworks taking into account the internal structure of the Geant4
     modules will have to be adapted to the new configuration (see
-    <A HREF=#geo-notes">notes</A> for the details).</LI>
+    <A HREF="#geo-notes">notes</A> for the details).</LI>
 </UL>
 
 <P> </P>

config/History

@@ -1,5 +1,5 @@
-$Id: History,v 1.231 2003/11/18 09:08:10 gcosmo Exp $
-$Name: geant4-06-00 $
+$Id: History,v 1.235 2004/02/09 15:22:48 gunter Exp $
+$Name: geant4-06-00-patch-01 $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,24 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+9th February 2004  Gunter Folger
+- protect OGLFLAGS against containing -I/usr/include; this may cause 
+   wrong includes to be picked up.
+   
+30th January 2004  Guy Barrand
+- WIN32-VC7.gmk: material to build shared libs for Windows (DLLs).
+- config/win32def.c : program to help building DLLs.
+- source/GNUmakefile : target to build win32def.exe
+- source/materials/GNUmakefile : example of macro GLOBLIBS
+  used by the DLL builder in order to have global lib dependencies.
+
+26th January 2004  Guy Barrand (config-V06-00-00)
+- Darwin-g++.gmk:
+  o Use "g++" as a default compiler (in order to take the MacOSX
+    default compiler).
+  o Corrected procedure for building .dylib shared libs.
+    Previous default Linux commands do not work on MacOSX.
+
 18th November 2003  Gabriele Cosmo (config-V05-02-05)
 - Updated binmake.gmk to include new hadronics modules.
   Coworks with "ghad-V05-02-00" and HEAD of processes/GNUmakefile.

config/architecture.gmk

@@ -1,4 +1,4 @@
-# $Id: architecture.gmk,v 1.90 2003/10/17 10:17:11 gbarrand Exp $
+# $Id: architecture.gmk,v 1.91 2004/02/09 15:22:49 gunter Exp $
 # ------------------------------------------------------------------------
 #       GEANT 4 - Architecture configuration script for GNU Make
 #
@@ -260,6 +260,15 @@ GREP := grep
 #
 include $(G4INSTALL)/config/sys/$(G4SYSTEM).gmk
 
+#  make certain that OGLFLAGS does NOT contain -I/usr/include
+#   caused by OGLHOME being /usr, as e.g. on Linux
+#
+ifdef OGLFLAGS
+  OGLFLAGS:= $(filter-out -I/usr/include,$(OGLFLAGS))
+  OGLFLAGS:= $(filter-out -I/usr//include,$(OGLFLAGS))
+endif
+	
+	
 # If there is no cbrt() function...
 #
 ifdef G4_NO_CBRT

config/sys/Darwin-g++.gmk

@@ -3,15 +3,19 @@
 #
 # MacOS 10.1 GNU-gcc 2.92.2
 # MacOS 10.2 there is g++2 and g++3, choose consistently one,
-#            like g++2 which is 2.95.2
-# use   echo -n    (there is not the echo -e option of Linux)
+#            like g++2 which is 2.95.2, g++3 for 3.X.
+# MacOS 10.3 use default MacOS-X compiler (g++) as the default.
+#            Have commands to build the .dylib (MacOS-X shared libs)
 # 
-# Helmut Burkhardt - CERN
+# Use   echo -n    (there is not the 'echo -e' option of Linux)
+#
+# Author: Helmut Burkhardt - CERN
 #
 ifeq ($(G4SYSTEM),Darwin-g++)
-# choice of GNU compilers:
-  CXX       := g++2
-# CXX       := g++3
+# choice of compiler (take, as default, the MacOS default) :
+#  CXX       := g++2
+#  CXX       := g++3
+  CXX       := g++
   CXXFLAGS  := -Wall -ansi -pedantic -pipe
 # optionally add verbose flag
 # CXXFLAGS  += -v
@@ -36,12 +40,12 @@ ifeq ($(G4SYSTEM),Darwin-g++)
     FCFLAGS   += -fPIC
     CCFLAGS   += -fPIC
   endif
-  G4RUNPATHOPTION := -Wl,-rpath 
+#  G4RUNPATHOPTION := -Wl,-rpath 
   FC := g77
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
   FCLIBS := -lg2c -lnsl
   ECHO    := /bin/echo -n
-  SHEXT   := so
+  SHEXT   := dylib
   X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
   X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lSM -lICE
   XMFLAGS   := -I/usr/X11R6/include
@@ -60,13 +64,12 @@ ifeq ($(G4SYSTEM),Darwin-g++)
   define build-granular-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`; \
      cd $(G4TMPDIR); \
-     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) *.o
+     g++ -dynamiclib -flat_namespace -undefined suppress -o $$libdir/$(@F) $(INTYLIBS) *.o
   endef
   define build-global-shared-lib
-    @libdir=`(cd $(@D);/bin/pwd)`; \
+    libdir=`(cd $(@D);/bin/pwd)`; \
      cd $(G4TMP)/$(G4SYSTEM); \
-     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) \
-                    $(foreach dir,$(SUBLIBS),$(dir)/*.o);
+     g++ -dynamiclib -flat_namespace -undefined suppress -o $$libdir/$(@F) $(INTYLIBS) $(foreach dir,$(SUBLIBS),$(dir)/*.o);
   endef
 
 endif

config/sys/Linux-icc.gmk

@@ -0,0 +1,60 @@
+#
+# ------ GNU/LINUX ------     !!! not supported !!!
+#                                 Intel icc 8.0
+ifeq ($(G4SYSTEM),Linux-icc)
+  CXX       := icc
+  CXXFLAGS  := -ansi -no-gcc -w1
+  ifdef G4OPTIMISE
+    CXXFLAGS  += -O
+    FCFLAGS   := -O
+    CCFLAGS   := -O
+  else
+    ifdef G4DEBUG
+      CXXFLAGS  += -g
+      FCFLAGS   := -g
+      CCFLAGS   := -g
+    endif
+  endif
+  ifdef G4PROFILE
+    CXXFLAGS  += -qp
+    FCFLAGS   += -qp
+    CCFLAGS   += -pg
+  endif
+  ifdef G4LIB_BUILD_SHARED
+    CXXFLAGS  += -fPIC
+    FCFLAGS   += -fPIC
+    CCFLAGS   += -fPIC
+  endif
+  G4RUNPATHOPTION := -Xlinker
+  CC := gcc
+  FC := g77
+  FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
+  FCLIBS := -lg2c -lnsl
+  AR := xiar r
+  ECHO    := /bin/echo -e
+  SHEXT   := so
+  X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
+  X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lSM -lICE
+  XMFLAGS   := -I/usr/X11R6/include
+  XMLIBS    := -lXm -lXpm
+  DLDLIBS   := -ldl
+  ifndef OGLFLAGS
+    OGLFLAGS  := -I$(OGLHOME)/include 
+  endif
+  ifndef OGLLIBS
+    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
+  endif
+  OIVFLAGS  += -I$(OIHOME)/include 
+  define build-granular-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+     cd $(G4TMPDIR); \
+     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) *.o
+  endef
+  define build-global-shared-lib
+    @libdir=`(cd $(@D);/bin/pwd)`; \
+     cd $(G4TMP)/$(G4SYSTEM); \
+     $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) \
+                    $(foreach dir,$(SUBLIBS),$(dir)/*.o);
+  endef
+
+endif