Import Geant4 8.3.1 source tree

Author: gcosmo

ReleaseNotes/Patch4.8.3-1.txt

@@ -0,0 +1,74 @@
+
+                 Geant4 8.3 - patch-01 Release Notes
+                 -----------------------------------
+
+                                                           17 August 2007
+
+List of fixes included in this public patch since the public release 8.3:
+
+  o Configuration:
+    -------------
+    + liblist.c: fixed problem affecting recent CygWin installations on
+      Windows in parsing the buffer for the generation of libname.map.
+    + binmake.gmk: defined OUT internal variable specifying the proper
+      compilation/linking option to Unix or Windows compilers: '-o '
+      and '/Fe' respectively. Cleared <TAB> characters where not necessary.
+    + SUN-CC.gmk: forced -xO2 as optimisation level.
+
+  o Geometry:
+    --------
+    + magneticfield:
+      o Relaxed 'FatalException' to 'Warning' in method
+        G4MagIntegratorDriver::AccurateAdvance() for case of step zero and
+        return previous value. This fixes problem observed by ATLAS and CMS
+        in release 8.3 when using very conservative values for field
+        parameters.
+    + solids/specific:
+      o Fixes in G4Polyhedra::GetPointOnSurface():
+        Correctly treat 'totalPhi' instead of 'endPhi' for the case of open
+        shapes and 'twopi' for not open shapes.
+        Introduced fix for the case when number of sectors (numSide) is equal
+        to 1. At the origin of problems observed when checking overlaps for
+        polyhedra solids defined as such.
+
+  o Global:
+    ------
+    + Changed date for patch-01 to release 8.3.
+
+  o Materials:
+    ---------
+    + G4NistElementBuilder: added protection (Z>=limitNumElements) inside
+      method BuildElement().
+
+  o Hadronic Processes:
+    ------------------
+    + models/chiral_inv_phase_space:
+      o G4QuasiFreeRatios: fixed DB filling (ID update), responsible for
+        excessive growth of memory in long runs. Corrected indexing and
+        computation of cos(theta).
+    + util:
+      o Three bug fixes in G4ReactionDynamics::TwoCluster(): removed a sharp
+        peak at 180 degrees by fixing a units error and fixed an error in
+        sampling the momentum transfer. Fixed array bound violation which
+        caused in some rare occasions an infinite loop.
+
+  o Physics Lists:
+    -------------
+    + Correct use of QElasticPhysics in QGSP_QEL list.
+
+ ----------------------------------------------------------------------------
+
+                             Technical Notes
+                             --------------- 
+
+  o  This patch should be applied on top of release 8.3
+  o  Technical notes distributed for release 8.3 are also applicable and
+     valid for this patch.
+
+The code and rebuilt binary libraries for release 8.3 are available
+through our "Archive of Previous Releases" Web page:
+   http://cern.ch/geant4/support/source_archive.shtml
+
+Please refer to the Geant4 User Documentation:
+   http://cern.ch/geant4/support/userdocuments.shtml
+for further information about using Geant4.

config/History

@@ -1,4 +1,4 @@
-$Id: History,v 1.289 2007/02/28 15:35:31 gcosmo Exp $
+$Id: History,v 1.289.2.1 2007/08/13 14:30:39 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,16 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+13th August 2007  Gabriele Cosmo (config-V08-03-00a)
+- SUN-CC.gmk: forced -xO2 as optimisation level.
+
+18th July 2007  Gabriele Cosmo
+- liblist.c: fixed problem affecting recent CygWin installations on
+  Windows in parsing the buffer for the generation of libname.map.
+- binmake.gmk: defined OUT internal variable specifying the proper
+  compilation/linking option to Unix or Windows compilers: '-o '
+  and '/Fe' respectively. Cleared <TAB> characters where not necessary.
+
 28th February 2007  Gabriele Cosmo (config-V08-02-00)
 - Protected generation of dependencies using internal 'make' variable
   MAKECMDGOALS in binmake.gmk and common.gmk, following suggestion made
@@ -24,7 +34,8 @@ committal in the CVS repository !
   issueing the 'clean' target.
 
 3rd November 2006  Gunter Folger (config-V08-01-07)
-- architecture.gmk: added G4LIB_BUILD_LISTS with default value 1 to build physics lists.
+- architecture.gmk: added G4LIB_BUILD_LISTS with default value 1 to build
+  physics lists.
 - binmake.gmk: added physics lists include directories to INCFLAGS.
 
 15th October 2006  Makoto Asai (config-V08-01-06)

config/binmake.gmk

@@ -1,4 +1,4 @@
-# $Id: binmake.gmk,v 1.117 2007/02/28 15:35:07 gcosmo Exp $
+# $Id: binmake.gmk,v 1.126.2.2 2007/08/16 09:42:33 gcosmo Exp $
 # ----------------------------------------------------------
 # Script defining rules and paths for making binaries.
 #    First implementation: Gabriele Cosmo, 25/06/1998.
@@ -60,8 +60,8 @@ ifndef INCFLAGS
               -I$(G4BASE)/particles/hadrons/ions/include \
               -I$(G4BASE)/particles/hadrons/mesons/include \
               -I$(G4BASE)/particles/shortlived/include \
-	      -I$(G4BASE)/physics_lists/lists/include \
-	      -I$(G4BASE)/physics_lists/builders/include \
+              -I$(G4BASE)/physics_lists/lists/include \
+              -I$(G4BASE)/physics_lists/builders/include \
               -I$(G4BASE)/processes/management/include \
               -I$(G4BASE)/processes/cuts/include \
               -I$(G4BASE)/processes/scoring/include \
@@ -77,19 +77,19 @@ ifndef INCFLAGS
               -I$(G4BASE)/processes/electromagnetic/highenergy/include \
               -I$(G4BASE)/processes/electromagnetic/polarisation/include \
               -I$(G4BASE)/processes/hadronic/cross_sections/include \
-	      -I$(G4BASE)/processes/hadronic/management/include \
-	      -I$(G4BASE)/processes/hadronic/models/abrasion/include \
+              -I$(G4BASE)/processes/hadronic/management/include \
+              -I$(G4BASE)/processes/hadronic/models/abrasion/include \
               -I$(G4BASE)/processes/hadronic/models/binary_cascade/include \
-	      -I$(G4BASE)/processes/hadronic/models/cascade/cascade/include \
-	      -I$(G4BASE)/processes/hadronic/models/cascade/evaporation/include \
-	      -I$(G4BASE)/processes/hadronic/models/cascade/utils/include \
+              -I$(G4BASE)/processes/hadronic/models/cascade/cascade/include \
+              -I$(G4BASE)/processes/hadronic/models/cascade/evaporation/include \
+              -I$(G4BASE)/processes/hadronic/models/cascade/utils/include \
               -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/body/include \
               -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/interface/include \
               -I$(G4BASE)/processes/hadronic/models/coherent_elastic/include \
-	      -I$(G4BASE)/processes/hadronic/models/de_excitation/ablation/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/ablation/include \
               -I$(G4BASE)/processes/hadronic/models/de_excitation/evaporation/include \
               -I$(G4BASE)/processes/hadronic/models/de_excitation/fermi_breakup/include \
-	      -I$(G4BASE)/processes/hadronic/models/de_excitation/fission/include \
+              -I$(G4BASE)/processes/hadronic/models/de_excitation/fission/include \
               -I$(G4BASE)/processes/hadronic/models/de_excitation/gem_evaporation/include \
               -I$(G4BASE)/processes/hadronic/models/de_excitation/handler/include \
               -I$(G4BASE)/processes/hadronic/models/de_excitation/management/include \
@@ -211,11 +211,11 @@ ifdef GLOBALLIBS
   ifeq ($(G4LIB_BUILD_LISTS),1)
     LDLIBS2 += -lG4physicslists
   endif
-    
+
   LDLIBS2 += -lG4run \
              -lG4event \
              -lG4tracking \
-	     -lG4parmodels \
+             -lG4parmodels \
              -lG4processes \
              -lG4digits_hits \
              -lG4track \
@@ -231,19 +231,19 @@ else
   ifeq ($(G4INCLUDE_EXEC),1)
     LDLIBS2 = $(shell \
         G4TMP=$(G4TMP); export G4TMP; \
-	if [ \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
-	  -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
-	$(G4LIB)/$(G4SYSTEM)/liblist \
-	  -m $(G4LIB)/$(G4SYSTEM) \
-	  < $(G4LIB)/$(G4SYSTEM)/libname.map; fi)
+        if [ \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
+          -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
+        $(G4LIB)/$(G4SYSTEM)/liblist \
+          -m $(G4LIB)/$(G4SYSTEM) \
+          < $(G4LIB)/$(G4SYSTEM)/libname.map; fi)
   else
     LDLIBS2 = $(shell \
         G4TMP=$(G4TMP); export G4TMP; \
-	if [ \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
-	  -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
-	$(G4LIB)/$(G4SYSTEM)/liblist \
-	  -d $(G4TMPDIR) \
-	  < $(G4LIB)/$(G4SYSTEM)/libname.map; fi)
+        if [ \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
+          -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
+        $(G4LIB)/$(G4SYSTEM)/liblist \
+          -d $(G4TMPDIR) \
+          < $(G4LIB)/$(G4SYSTEM)/libname.map; fi)
 # Warning: do not add to LDLIBS2 with += because this causes it to be
 # expanded too soon.  Hence extra libraries must have a different name...
 # Extra libraries to resolve remaining circular dependencies...
@@ -282,6 +282,7 @@ LDLIBS_PREFINAL += $(LDLIBS4)
 LDLIBS_KERNEL   += $(LDLIBS4)
 
 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+  # Windows
   WIN32TMP := $(patsubst -L%,$(LIB_PATH)%,$(LDFLAGS))
   LDFLAGS  = $(patsubst /,$(PATH_DEL),$(WIN32TMP))
   WIN32TMP2 := $(patsubst -L%,$(LIB_PATH)%,$(LDLIBS_PREFINAL))
@@ -291,20 +292,23 @@ ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
     ifdef G4LIB_USE_DLL
         LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.a,$(WIN32TMP3)) $(patsubst -l%,lib%.lib,$(WIN32TMP4))
     else
-	LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.lib,$(WIN32TMP2))
+        LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.lib,$(WIN32TMP2))
     endif
   else
-  	LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.a,$(WIN32TMP2))
+    LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.a,$(WIN32TMP2))
   endif
+  OUT   := /Fe
 else
+  # Unix
   LDLIBS = $(TARGETLIB) $(LDLIBS_PREFINAL)
+  OUT   := -o 
 endif
 
 ifdef transform-RPath
 # Invoke system specific transformation of 
 include $(G4INSTALL)/config/sys/$(G4SYSTEM)-runpath.gmk
 endif
-	
+
 sources := $(wildcard $(G4TARGET).cc)
 objects := $(patsubst %.cc,$(G4TMPDIR)/exe/%.$(TARGOBJEXT),$(sources))
 dependencies := $(patsubst %.cc,$(G4TMPDIR)/exe/%.d,$(sources))
@@ -339,12 +343,12 @@ endif
 	@if [ ! -d $(G4BINDIR) ] ; then mkdir $(G4BINDIR) ;fi
 ifdef CPPVERBOSE
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) \
-	  -o $(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
+	  $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
 	  $(LDLIBS)
 else
 	@echo Linking $(G4TARGET) ...
 	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) \
-	  -o $(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
+	  $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
 	  $(LDLIBS)
 	@if [ \( -f $(G4BINDIR)/$(G4TARGET) \) ]; then \
 	  echo "... Done!"; fi

config/liblist.c

@@ -1,4 +1,4 @@
-/* $Id: liblist.c,v 1.18 2006/10/05 14:22:06 gcosmo Exp $ */
+/* $Id: liblist.c,v 1.19 2007/07/18 14:21:15 gcosmo Exp $ */
 
 /*
 Given a "libname.map" file on standard input and a list or directory
@@ -303,7 +303,6 @@ int main (int argc, char** argv) {
 
 #if defined ( _WIN32 ) || defined ( __CYGWIN__ ) || defined ( __CYGWIN32__ )
       ptr=strchr(ntg4tmp1,':');
-      if ( ptr ) *(ptr+1)='\0';
 
       while ( ptr=strchr(buffer,'\\') ) *ptr='/';
 

config/sys/SUN-CC.gmk

@@ -4,7 +4,7 @@
 ifeq ($(G4SYSTEM),SUN-CC)
   CXX       := CC
   ifdef G4OPTIMISE
-    CXXFLAGS  := -O
+    CXXFLAGS  := -xO2
   else
     ifdef G4DEBUG
       CXXFLAGS  := -g

source/GNUmakefile

@@ -152,7 +152,7 @@ endif
 
 banner:
 	@$(ECHO) "*************************************************************"
-	@$(ECHO) " Installation Geant4 version $$Name: geant4-08-03 $ "
+	@$(ECHO) " Installation Geant4 version $$Name: geant4-08-03-patch-01 $ "
 	@$(ECHO) " Copyright (C) 1994-2007 Geant4 Collaboration                            "
 	@$(ECHO) "*************************************************************"
 

source/geometry/magneticfield/History

@@ -1,4 +1,4 @@
-$Id: History,v 1.117 2007/05/10 10:11:08 japost Exp $
+$Id: History,v 1.117.2.1 2007/08/13 13:23:42 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,11 +16,20 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+June 8th, 2007 T. Nikitina - field-V08-03-00a
+--------------------------
+- Relax FatalException to Warning in G4MagIntegratorDriver::AccurateAdvance()
+  for case of step zero and return previous value. This fixes problem observed
+  by ATLAS in release 8.3 when using very conservative values for field
+  parameters.
+
 May 10th, 2007    J.Apostolakis - field-V08-02-01
 -------------------------------
 - G4MagIntegratorDriver: 
-    * added protections against zero initial or internal step h=0, (exceptions)
-    * revised (re)calculation of h, and quit loop if h/length < smallest-fraction (~ 10^-12) 
+  * added protections against zero initial or internal step h=0, (exceptions)
+  * revised (re)calculation of h, and quit loop if h/length < smallest-fraction
+    (~ 10^-12) 
 
 April 26th, 2007  T.Nikitina - field-V08-02-00
 ----------------------------

source/geometry/magneticfield/src/G4MagIntegratorDriver.cc

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4MagIntegratorDriver.cc,v 1.46 2007/05/10 10:10:31 japost Exp $
-// GEANT4 tag $Name: geant4-08-03 $
+// $Id: G4MagIntegratorDriver.cc,v 1.46.2.2 2007/08/17 12:18:57 gcosmo Exp $
+// GEANT4 tag $Name: geant4-08-03-patch-01 $
 //
 // 
 //
@@ -153,11 +153,25 @@ G4MagInt_Driver::AccurateAdvance(G4FieldTrack& y_current,
   G4FieldTrack yStartFT(y_current);
 
   //  Ensure that hstep > 0 
-  if( hstep <= 0.0 ) { 
-    G4cerr << " Hstep is " << hstep << G4endl;
-    G4Exception("G4MagInt_Driver::AccurateAdvance()", 
-		"Requested Integration Step is zero or negative: it must be positive",
-		FatalException, "Requested-Step-not-Positive."); 
+  if( hstep <= 0.0 )
+  { 
+    if(hstep==0.0)
+    {
+      G4cerr << "WARNING - G4MagIntegratorDriver::AccurateAdvance()" << G4endl
+             << "          Proposed step is zero; hstep = " << hstep
+             << " !" << G4endl;
+      return succeeded; 
+    }
+    else
+    { 
+      G4cerr << "ERROR - G4MagIntegratorDriver::AccurateAdvance()" << G4endl
+             << "        Proposed step is negative; hstep = " << hstep
+             << " !" << G4endl;
+      G4Exception("G4MagInt_Driver::AccurateAdvance()", 
+                  "InvalidCall", EventMustBeAborted,
+                  "Requested step cannot be negative! Aborting event.");
+      return false;
+    }
   }
 
   y_current.DumpToArray( ystart );

source/geometry/solids/specific/History

@@ -1,4 +1,4 @@
-$Id: History,v 1.109 2007/04/26 13:27:37 gcosmo Exp $
+$Id: History,v 1.109.2.1 2007/08/13 14:00:20 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,16 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+12-Jul-2007, T.Nikitina (geom-specific-V08-03-00a)
+- Fix in G4Polyhedra::GetPointOnSurface() to correctly treat 'totalPhi'
+  instead of 'endPhi' for the case of open shapes and 'twopi' for not open
+  shapes.
+
+05-Jul-2007, T.Nikitina
+- Fix in G4Polyhedra::GetPointOnSurface() for the case when number of sectors
+  (numSide) is equal to 1. At the origin of problems observed when checking
+  overlaps for polyhedra solids defined as such.
+
 26-Apr-2007, T.Nikitina (geom-specific-V08-02-05)
 - Fix in GetPointOnSurface() for G4Polycone to consider also points laying
   on rings when consecutive Z-sections are coincident.