Import Geant4 10.7.4 source tree

Author: gcosmo

CMakeLists.txt

@@ -33,7 +33,7 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX
 project(Geant4)
 set(${PROJECT_NAME}_VERSION_MAJOR 10)
 set(${PROJECT_NAME}_VERSION_MINOR  7)
-set(${PROJECT_NAME}_VERSION_PATCH  3)
+set(${PROJECT_NAME}_VERSION_PATCH  4)
 set(${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}")
 
 # - Prepend our own CMake Modules to the search path

CONTRIBUTING.rst

@@ -1,6 +1,6 @@
 Contributing to Geant4
 =====
-To contribute patches to Geant4, users can submit Pull Requests (PR) such that:
+To contribute patches to Geant4, users can submit normal GitHub Pull Requests (PR) such that:
 
 - A single PR refers to a single particular topic (fix or suggested enhancement);
   PRs including uncorrelated changes in codes in different areas or modules will
@@ -10,10 +10,12 @@ A PR will be examined by a responsible and eventually extracted for a patch in
 the development repository of Geant4, to be included in a future release or
 patch.
 
-For simple bug-fixes, it is anyhow recommended to use the official
-Bugzilla problem reporting system.
+For simple bug-fixes, it is still recommended to use the official Bugzilla problem reporting system
+to report the issue, linking back to the Pull Request if created:
+
 - Problem reports: `Bugzilla problem reporting system <https://bugzilla-geant4.kek.jp>`_.
-- User Forum: `Geant4 Forum <https://geant4-forum.web.cern.ch>`_.
-- Documentation: `User Documentation <https://cern.ch/geant4/support/user_documentation>`_.
 
-The Geant4 Collaboration
+Questions on Geant4 itself or feature requests should be made through our `User Forum <https://geant4-forum.web.cern.ch>`_,
+and `full documentation on use of the toolkit is online <https://cern.ch/geant4/support/user_documentation>`_.
+
+The Geant4 Collaboration

README.rst

@@ -1,8 +1,40 @@
 =====
-Geant4: A Simulation Toolkit 
+Geant4: A Simulation Toolkit
 =====
 
-- Problem reports: `Bugzilla problem reporting system <https://bugzilla-geant4.kek.jp>`_.
-- User Forum: `Geant4 Forum <https://geant4-forum.web.cern.ch>`_.
-- Documentation: `User Documentation <https://cern.ch/geant4/support/user_documentation>`_.
+Geant4 is a toolkit for the simulation of the passage of particles through matter.
+Its areas of application include high energy, nuclear and accelerator physics, as well
+as studies in medical and space science.
 
+For more information about how to use Geant4 and its application domains, please visit
+`the Geant4 website <https://cern.ch/geant4>`_
+
+There are three main reference papers for Geant4:
+
+- `Nuclear Instruments and Methods in Physics Research A 835 (2016) 186-225 <http://www.sciencedirect.com/science/article/pii/S0168900216306957>`_
+- `IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278 <https://ieeexplore.ieee.org/xpls/abs_all.jsp?isnumber=33833&amp;arnumber=1610988&amp;count=33&amp;index=7>`_
+- `Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303 <http://www.sciencedirect.com/science/article/pii/S0168900203013688>`_
+
+=====
+Installation
+=====
+For detailed instructions on building and installing Geant4, including all
+supported platforms and configuration options, please refer to
+the `Installation Guide <http://cern.ch/geant4-userdoc/UsersGuides/InstallationGuide/html>`_.
+
+=====
+Questions, Bugs, and Requirements
+=====
+Full documentation on Geant4, including installation, use of the toolkit in applications,
+physics lists, and physics model implementations, can be found on the `User Documentation Site <http://cern.ch/geant4/support/user_documentation>`_.
+
+If you have a question about, or issue using, Geant4, please post on our `User Forum <http://cern.ch/geant4-forum>`_
+in the Category and Section relevent to your problem. The forum is `fully searchable <http://cern.ch/geant4-forum/search>`_
+so it's possible your question may already have been answered.
+
+If you think you have found a bug in Geant4, please open a ticket on our `Bugzilla Tracker <http://bugzilla-geant4.kek.jp>`_.
+
+=====
+Contributing to Geant4
+=====
+Please see the main `Contribution Guide <./CONTRIBUTING.rst>`_.

ReleaseNotes/Patch4.10.7-4.txt

@@ -0,0 +1,76 @@
+
+                 Geant4 10.7 - patch-04 Release Notes
+                 ------------------------------------
+
+                                                            9 September 2022
+
+List of fixes included in this public patch since the public release 10.7.p03:
+
+  o Configuration
+    -------------
+    + CMake:
+      o Update extraction of include paths from VecGeom to use imported target 
+        property. Addressing problem report #2485.
+
+  o Global:
+    ------
+    + Updated date and version for 10.7.p04.
+
+  o Physics Lists:
+    -------------
+    + constructors/electromagnetic
+      o G4GammaGeneralProcess: fixed problem of Compton scattering selection
+        in the low energy interval < 150 keV.
+
+  o Processes - Electromagnetic:
+    ---------------------------
+    + utils
+      o G4EmExtraParameters: safe definition of StepFuction for G4GenericIon.
+        Addressing problem report #2495.
+      o G4EmExtraParametersMessenger: fixed typo.
+        Addressing problem report #2492.
+
+  o Processes - Hadronic:
+    --------------------
+    + cross_sections
+      o G4ComponentAntiNuclNuclearXS: correct treatment of the cross-sections
+        of light anti-nuclei on hydrogen target. This relies on the isospin
+        symmetry assumption, according to which the properties of the reactions
+        between anti-proton and light nuclei are equivalent to those between
+        light anti-nuclei and hydrogen.
+    + models/coherent_elastic
+      o G4AntiNuclElastic: correction in SampleInvariantT() method of the
+        highest momentum transfer (which was causing the cosine of the polar
+        angle in the center-of-mass system to be larger than 1 in some cases).
+        Addressing problem report #2204.
+    + models/inclxx
+      o G4INCLXXInterface: fixed treatment of kaon0, anti_kaon0, kaon0L, and
+        kaon0S. In current reference physics lists, INCLXX is never used for
+        handling kaons, although it is capable of doing so, but at process-
+        level or in custom physics lists one could observe crashes when trying
+        to use INCLXX for neutral kaon projectiles. The change fixes this
+        misbehavior.
+    + models/particle_hp
+      o Fixed issue for photons too high in energy generated from
+        G4NDL/Capture/FSMF6 data. Addressing problem report #2468.
+      o G4ParticleHPContAngularPar: added protections against evaluations of
+        arrays at negative index (-1), fixing rare reproducibility problems
+        and rare crashes observed.
+      o Code cleanup in G4ParticleHPContEnergyAngular and
+        G4ParticleHPContAngularPar: removed debug and commented out code,
+        indentation of loops and if branches.
+
+ ----------------------------------------------------------------------------
+
+                             Technical Notes
+                             --------------- 
+
+  o  This patch should be applied on top of release 10.7 series.
+  o  Technical notes distributed for release 10.7 are also applicable and
+     valid for this patch.
+
+The code and rebuilt binary libraries for release 10.7.p04 are available
+through the Geant4 "Download" Web page.
+
+Please refer to the Geant4 User Documentation for further information about
+using Geant4.

cmake/History

@@ -30,6 +30,11 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
 
      ----------------------------------------------------------
 
+14th July 2022 - Ben Morgan (cmake-V10-06-54)
+- Address [Bugzilla 2485](https://bugzilla-geant4.kek.jp/show_bug.cgi?id=2485)
+  - Update extraction of include paths from VecGeom to use imported target
+    property.
+
 24th September 2021 - Ben Morgan (cmake-V10-06-53)
 - Rename Geant4::HDF5 to hdf5::hdf5 to be compatible with
   imported target provided since CMake 3.20.

cmake/Modules/G4ConfigurePkgConfigHelpers.cmake

@@ -208,16 +208,13 @@ if(NOT GEANT4_BUILD_GRANULAR_LIBS AND UNIX)
   # - USolids
   if(GEANT4_USE_USOLIDS OR GEANT4_USE_PARTIAL_USOLIDS)
     set(G4_BUILTWITH_USOLIDS "yes")
-    set(G4_USOLIDS_INCLUDE_DIRS "${USOLIDS_INCLUDE_DIRS} ${VECGEOM_EXTERNAL_INCLUDES}")
+    get_target_property(G4_USOLIDS_INCLUDE_DIRS VecGeom::vecgeom INTERFACE_INCLUDE_DIRECTORIES)
     list(REMOVE_DUPLICATES G4_USOLIDS_INCLUDE_DIRS)
-    if(_cxx_compiler_dirs)
-      list(REMOVE_ITEM G4_USOLIDS_INCLUDE_DIRS ${_cxx_compiler_dirs})
-    endif()
-
-    string(REPLACE ";" " " G4_USOLIDS_CFLAGS "${VECGEOM_DEFINITIONS}")
     foreach(_dir ${G4_USOLIDS_INCLUDE_DIRS})
       set(G4_USOLIDS_CFLAGS "${G4_USOLIDS_CFLAGS} -I${_dir}")
     endforeach()
+    # NB: should ALSO account for VecGeom having compile_options, but
+    # this is better handled through proper pkg-config support
   else()
     set(G4_BUILTWITH_USOLIDS "no")
   endif()

examples/advanced/ChargeExchangeMC/ChargeExchangeMC.out

@@ -4,7 +4,7 @@
         ############################################
 
 **************************************************************
- Geant4 version Name: geant4-10-07-patch-03    (19-November-2021)
+ Geant4 version Name: geant4-10-07-patch-04    (9-September-2022)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278
@@ -1357,7 +1357,7 @@ Event 17673
 Run terminated.
 Run Summary
   Number of events processed : 17674, effectively: 10
-  User=14.780000s Real=16.507339s Sys=0.000000s
+  User=15.840000s Real=16.441131s Sys=0.000000s
 
  --- Setup acceptances (range | real (trg / mon) | rec (trg / mon / all)):
         1 [ 1.0000,  0.8000)  | 0.00210084 ( 1 / 476 )  | 0.00000000 ( 0 / 476 / 581 )

examples/advanced/air_shower/air_shower.out

@@ -5,7 +5,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
         ############################################
 
 **************************************************************
- Geant4 version Name: geant4-10-07-patch-03    (19-November-2021)
+ Geant4 version Name: geant4-10-07-patch-04    (9-September-2022)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278
@@ -90,12 +90,10 @@ Registered graphics systems are:
   VRML1FILE (VRML1FILE)
   VRML2FILE (VRML2FILE)
   gMocrenFile (gMocrenFile)
-  OpenGLImmediateQt (OGLIQt, OGLI)
-  OpenGLStoredQt (OGLSQt, OGL, OGLS)
-  OpenGLImmediateXm (OGLIXm, OGLIQt_FALLBACK)
-  OpenGLStoredXm (OGLSXm, OGLSQt_FALLBACK)
-  OpenGLImmediateX (OGLIX, OGLIQt_FALLBACK, OGLIXm_FALLBACK)
-  OpenGLStoredX (OGLSX, OGLSQt_FALLBACK, OGLSXm_FALLBACK)
+  OpenGLImmediateXm (OGLIXm, OGLI)
+  OpenGLStoredXm (OGLSXm, OGL, OGLS)
+  OpenGLImmediateX (OGLIX, OGLIXm_FALLBACK)
+  OpenGLStoredX (OGLSX, OGLSXm_FALLBACK)
   RayTracerX (RayTracerX)
 
 Registering model factories...
@@ -620,8 +618,8 @@ See commands in /vis/modeling/trajectories/ for other options.
 ooo Run 0 starts (global).
 
 --------- Ranlux engine status ---------
- Initial seed = 1637157527
- float_seed_table[] = 0.0187778 0.396597 0.529181 0.677293 0.352192 0.67713 0.79193 0.460082 0.727992 0.918076 0.0219187 0.0562408 0.433596 0.917143 0.654426 0.204529 0.128502 0.893171 0.461102 0.558663 0.453491 0.120746 0.668248 0.271648 
+ Initial seed = 1662627705
+ float_seed_table[] = 0.911634 0.27435 0.971525 0.652486 0.629954 0.0579018 0.982481 0.0993636 0.119168 0.46789 0.22111 0.526976 0.617646 0.643245 0.957797 0.467657 0.879749 0.317494 0.282794 0.770266 0.53643 0.801159 0.5943 0.431686 
  i_lag = 23, j_lag = 9
  carry = 0, count24 = 0
  luxury = 3 nskip = 199
@@ -632,7 +630,7 @@ mu- Mono Plane
  Run terminated.
 Run Summary
   Number of events processed : 100
-  User=1.890000s Real=2.086444s Sys=0.010000s
+  User=2.480000s Real=2.632633s Sys=0.000000s
 ### Run 0 (global) ended.
 0 events have been kept for refreshing and/or reviewing.
   "/vis/reviewKeptEvents" to review them one by one.
@@ -650,22 +648,22 @@ G4SDManager deleted.
 EventManager deleted.
 Units table cleared.
 TransportationManager deleted.
-Total navigation history collections cleaned: 10
+Total navigation history collections cleaned: 9
 ================== Deleting memory pools ===================
-Pool ID '20G4NavigationLevelRep', size : 0.0135 MB
+Pool ID '20G4NavigationLevelRep', size : 0.0115 MB
 Pool ID '24G4ReferenceCountedHandleIvE', size : 0.000961 MB
 Pool ID '7G4Event', size : 0.000961 MB
 Pool ID '15G4PrimaryVertex', size : 0.000961 MB
 Pool ID '17G4PrimaryParticle', size : 0.000961 MB
 Pool ID '15G4HCofThisEvent', size : 0.000961 MB
 Pool ID '16G4HitsCollection', size : 0.000961 MB
-Pool ID '17G4DynamicParticle', size : 0.024 MB
-Pool ID '7G4Track', size : 0.0481 MB
+Pool ID '17G4DynamicParticle', size : 0.026 MB
+Pool ID '7G4Track', size : 0.0509 MB
 Pool ID '18G4TouchableHistory', size : 0.000961 MB
 Pool ID '15G4CountedObjectIvE', size : 0.000961 MB
-Pool ID '15UltraOpticalHit', size : 0.00481 MB
+Pool ID '15UltraOpticalHit', size : 0.00385 MB
 Number of memory pools allocated: 12 of which, static: 0
-Dynamic pools deleted: 12 / Total memory freed: 0.098 MB
+Dynamic pools deleted: 12 / Total memory freed: 0.1 MB
 ============================================================
 G4Allocator objects are deleted.
 UImanager deleted.

examples/advanced/amsEcal/run1.out

@@ -4,7 +4,7 @@
         ############################################
 
 **************************************************************
- Geant4 version Name: geant4-10-07-patch-03    (19-November-2021)
+ Geant4 version Name: geant4-10-07-patch-04    (9-September-2022)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278
@@ -179,7 +179,7 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
  Run terminated.
 Run Summary
   Number of events processed : 10000
-  User=6.720000s Real=7.969201s Sys=0.000000s
+  User=6.740000s Real=6.840456s Sys=0.000000s
 
 -------------------------------------------------------------
  ---> The calorimeter is 9 Modules

examples/advanced/brachytherapy/brachytherapy.out

@@ -5,7 +5,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
         ############################################
 
 **************************************************************
- Geant4 version Name: geant4-10-07-patch-03    (19-November-2021)
+ Geant4 version Name: geant4-10-07-patch-04    (9-September-2022)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278
@@ -30,12 +30,10 @@ Registered graphics systems are:
   VRML1FILE (VRML1FILE)
   VRML2FILE (VRML2FILE)
   gMocrenFile (gMocrenFile)
-  OpenGLImmediateQt (OGLIQt, OGLI)
-  OpenGLStoredQt (OGLSQt, OGL, OGLS)
-  OpenGLImmediateXm (OGLIXm, OGLIQt_FALLBACK)
-  OpenGLStoredXm (OGLSXm, OGLSQt_FALLBACK)
-  OpenGLImmediateX (OGLIX, OGLIQt_FALLBACK, OGLIXm_FALLBACK)
-  OpenGLStoredX (OGLSX, OGLSQt_FALLBACK, OGLSXm_FALLBACK)
+  OpenGLImmediateXm (OGLIXm, OGLI)
+  OpenGLStoredXm (OGLSXm, OGL, OGLS)
+  OpenGLImmediateX (OGLIX, OGLIXm_FALLBACK)
+  OpenGLStoredX (OGLSX, OGLSXm_FALLBACK)
   RayTracerX (RayTracerX)
 
 Registering model factories...
@@ -384,7 +382,7 @@ msc:  for GenericIon  SubType= 10
 ionIoni:  for GenericIon  SubType=2
       dE/dx and range tables from 100 eV  to 100 TeV in 240 bins
       Lambda tables from threshold to 100 TeV, 20 bins/decade, spline: 1
-      StepFunction=(0.1, 0.02 mm), integ: 1, fluct: 1, linLossLim= 0.02
+      StepFunction=(0.1, 0.001 mm), integ: 1, fluct: 1, linLossLim= 0.02
       ===== EM models for the G4Region  DefaultRegionForTheWorld ======
          ParamICRU73 : Emin=    0 eV  Emax=  100 TeV  deltaVI