Import Geant4 11.1.3 source tree

.gitignore

@@ -10,7 +10,6 @@
 #======================================================================
 
 # ignore any hidden clang-format files
-*/.clang-format
 /format-original.txt
 /format-modified.txt
 

CMakeLists.txt

@@ -31,7 +31,7 @@ project(Geant4
   HOMEPAGE_URL "https://geant4.cern.ch")
 set(${PROJECT_NAME}_VERSION_MAJOR 11)
 set(${PROJECT_NAME}_VERSION_MINOR  1)
-set(${PROJECT_NAME}_VERSION_PATCH  2)
+set(${PROJECT_NAME}_VERSION_PATCH  3)
 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

ReleaseNotes/Patch.11.1-3.txt

@@ -0,0 +1,77 @@
+
+                 Geant4 11.1 - patch-03 Release Notes
+                 ------------------------------------
+
+                                                           10 November 2023
+
+List of fixes included in this public patch since the public release 11.1.2:
+
+  o Configuration:
+    -------------
+    + CMake
+      o Export non-cache variables to Geant4PackageCache to support CMake>=3.27.
+        Addresses problem report #2556.
+
+  o Externals:
+    ---------
+    + CLHEP
+      o Added missing shootArray() implementation in RandPoissonQ.
+    + G4tools
+      o Updated to version 6.1.1; fixed compilation warnings on Intel/icx
+        compiler and clang-15.
+    + PTL
+      o Disabled optimization of ThreadPool::execute_thread() on Apple/Intel
+        builds. Addressing problem report #2564.
+
+  o Global:
+    ------
+    + Updated date and version for 11.1.3.
+
+  o Intercoms:
+    ---------
+    + Added missing converter LtoS() in G4UImessenger.
+
+  o Physics Lists:
+    -------------
+    + constructors/decay
+      o G4RadioactiveDecayPhysics: replaced G4RadioactiveDecay with
+        G4Radioactivation to allow running also in biasing mode.
+
+  o Processes - Electromagnetic:
+    ---------------------------
+    + dna
+      o Use std::erfc() to avoid precision loss.
+        Fix imported from GitHub PR#58 (https://github.com/Geant4/geant4/pull/58).
+      o Removed unused header inclusion.
+    + low energy
+      o Fix for (rare) infinite loops in G4PenelopeComptonModel.
+        Reported in GitHub PR#61 (https://github.com/Geant4/geant4/pull/61).
+    + utils
+      o In G4TransportationWithMsc, always update momentum direction.
+      o Fixed computation of Birks saturation for compounds in G4EmSaturation.
+        Addressing problem report #2572.
+    + xrays
+      o Added protection against potential infinite loops in G4Cerenkov.
+        Addressing problem report #2555.
+
+  o Examples:
+    --------
+    + extended/parameterisations/Par04
+      o Bump tensorflow to 2.11.1.
+        Fixes GitHub PR#55 (https://github.com/Geant4/geant4/pull/55)
+        and GitHub PR#60 (https://github.com/Geant4/geant4/pull/60).
+
+ ----------------------------------------------------------------------------
+
+                             Technical Notes
+                             --------------- 
+
+  o  This patch should be applied on top of release 11.1 series.
+  o  Technical notes distributed for release 11.1 are also applicable and
+     valid for this patch.
+
+The code and rebuilt binary libraries for release 11.1.3 are available
+through the Geant4 "Download" Web page.
+
+Please refer to the Geant4 User Documentation for further information about
+using Geant4.

cmake/History

@@ -6,6 +6,10 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2023-08-24 Ben Morgan (cmake-V11-00-54)
+- Export non-cache variables to Geant4PackageCache to support CMake>=3.27
+  - Fixes Bugzilla 2556
+
 ## 2023-02-06 Ben Morgan (cmake-V11-00-53)
 - Remove no longer required G4VecGeomShim module.
   - VecGeom supports/supplies full imported targets since 1.1.18

cmake/Modules/G4CMakeUtilities.cmake

@@ -221,6 +221,21 @@ function(geant4_export_package_variables _file)
       get_property(__var_value CACHE ${__var} PROPERTY VALUE)
       get_property(__var_type CACHE ${__var} PROPERTY TYPE)
       get_property(__var_help CACHE ${__var} PROPERTY HELPSTRING)
+      # Variable may not be in cache, only local (canonical case being EXPAT_LIBRARY since CMake 3.27)
+      # We still need to account for these because they may be required to be in the CACHE at least set in
+      # earlier versions.
+      # 1. Variable may not be in cache, only local (canonical case being EXPAT_LIBRARY since CMake 3.27)
+      #    We still need to account for these because they may be required to be in the CACHE at least set in
+      #    earlier versions.
+      # 2. Depending on CMake version, variable may be in cache but unitialized, here we want the local value
+      if(((NOT __var_value) AND (NOT __var_type) AND (NOT __var_help)) OR (__var_type STREQUAL "UNINITIALIZED"))
+        set(__var_value ${${__var}})
+        # TODO: set type based on whether it looks like a bool or path, but PATH almost invariably what we save
+        # Only important in cmake GUI and if value needs to be changed, which we don't if package cache is used
+        set(__var_type PATH)
+        set(__var_help "no documentation, not a cache value")
+      endif()
+
       list(APPEND __local_build_setting "geant4_set_and_check_package_variable(${__var} \"${__var_value}\" ${__var_type} \"${__var_help}\")")
     endforeach()
 

cmake/Modules/G4OptionalComponents.cmake

@@ -78,6 +78,8 @@ else()
       unset(EXPAT_FOUND)
       unset(EXPAT_INCLUDE_DIR CACHE)
       unset(EXPAT_LIBRARY CACHE)
+      unset(EXPAT_LIBRARY_RELEASE CACHE)
+      unset(EXPAT_LIBRARY_DEBUG CACHE)
       message(FATAL_ERROR
 "Detected system expat header and library:
 EXPAT_INCLUDE_DIR = ${__badexpat_include_dir}
@@ -88,7 +90,7 @@ Set the above CMake variables to point to an expat install of the required versi
 
     # Backward compatibility for sources.cmake using the variable
     set(EXPAT_LIBRARIES EXPAT::EXPAT)
-    geant4_save_package_variables(EXPAT EXPAT_INCLUDE_DIR EXPAT_LIBRARY)
+    geant4_save_package_variables(EXPAT EXPAT_INCLUDE_DIR EXPAT_LIBRARY EXPAT_LIBRARY_RELEASE EXPAT_LIBRARY_DEBUG)
   else()
     set(EXPAT_FOUND TRUE)
     set(GEANT4_USE_BUILTIN_EXPAT TRUE)

examples/advanced/CaTS/CaTS.out

@@ -38,7 +38,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
 
 
 **************************************************************
- Geant4 version Name: geant4-11-01-patch-02    (15-June-2023)
+ Geant4 version Name: geant4-11-01-patch-03    (10-November-2023)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278
@@ -911,4 +911,4 @@ Correlated gamma emission flag                      0
 Max 2J for sampling of angular correlations         10
 =======================================================================
 writing Event: 0
-TimeTotal> 5.254 2.780
+TimeTotal> 3.231 2.530

examples/advanced/ChargeExchangeMC/ChargeExchangeMC.out

@@ -10,7 +10,7 @@
 
 
 **************************************************************
- Geant4 version Name: geant4-11-01-patch-02    (15-June-2023)
+ Geant4 version Name: geant4-11-01-patch-03    (10-November-2023)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278
@@ -1533,7 +1533,7 @@ Event 19509
 Run terminated.
 Run Summary
   Number of events processed : 19510, effectively: 10
-  User=14.320000s Real=14.449986s Sys=0.000000s
+  User=14.800000s Real=14.955140s Sys=0.010000s
 
  --- Setup acceptances (range | real (trg / mon) | rec (trg / mon / all)):
         1 [ 1.0000,  0.8000)  | 0.00000000 ( 0 / 528 )  | 0.00000000 ( 0 / 528 / 648 )

examples/advanced/HGCal_testbeam/testbeam_electron.out

@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
 
 
 **************************************************************
- Geant4 version Name: geant4-11-01-patch-02    (15-June-2023)
+ Geant4 version Name: geant4-11-01-patch-03    (10-November-2023)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278

examples/advanced/ICRP110_HumanPhantoms/ICRP110Phantoms.out

@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
 
 
 **************************************************************
- Geant4 version Name: geant4-11-01-patch-02    (15-June-2023)
+ Geant4 version Name: geant4-11-01-patch-03    (10-November-2023)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278
@@ -707,9 +707,9 @@ Threshold for very long decay time at rest        3.171e+10 y
      Cr_sctns:  Glauber-Gribov Nucl-nucl: 0 eV  ---> 25.6 PeV
 
 
-  Process: RadioactiveDecay
+  Process: Radioactivation
 
-  Process: RadioactiveDecay
+  Process: Radioactivation
 
 ---------------------------------------------------
                            Hadronic Processes for He3

examples/advanced/ICRP145_HumanPhantoms/ICRP145Phantoms.out

@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
 
 
 **************************************************************
- Geant4 version Name: geant4-11-01-patch-02    (15-June-2023)
+ Geant4 version Name: geant4-11-01-patch-03    (10-November-2023)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278
@@ -843,9 +843,9 @@ Threshold for very long decay time at rest        31709791983.76459 y
      Cr_sctns:  Glauber-Gribov Nucl-nucl: 0.000000 eV  ---> 25.600000 PeV
 
 
-  Process: RadioactiveDecay
+  Process: Radioactivation
 
-  Process: RadioactiveDecay
+  Process: Radioactivation
 
 ---------------------------------------------------
                            Hadronic Processes for He3

examples/advanced/STCyclotron/STCyclotron.out

@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
 
 
 **************************************************************
- Geant4 version Name: geant4-11-01-patch-02    (15-June-2023)
+ Geant4 version Name: geant4-11-01-patch-03    (10-November-2023)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278
@@ -542,7 +542,7 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
  Run terminated.
 Run Summary
   Number of events processed : 10
-  User=21.280000s Real=21.426749s Sys=0.000000s
+  User=21.170000s Real=21.365981s Sys=0.010000s
 ... write file : SolidTargetCyclotron.root - done
 ... close file : SolidTargetCyclotron.root - done
 G4 kernel has come to Quit state.
@@ -558,24 +558,24 @@ G4SDManager deleted.
 EventManager deleted.
 Units table cleared.
 TransportationManager deleted.
-Total navigation history collections cleaned: 11
+Total navigation history collections cleaned: 10
 G4RNGHelper object is deleted.
 ================== Deleting memory pools ===================
-Pool ID '20G4NavigationLevelRep', size : 0.0154 MB
+Pool ID '20G4NavigationLevelRep', size : 0.0135 MB
 Pool ID '24G4ReferenceCountedHandleIvE', size : 0.000961 MB
-Pool ID '17G4DynamicParticle', size : 0.396 MB
+Pool ID '17G4DynamicParticle', size : 0.489 MB
 Pool ID '16G4SmartVoxelNode', size : 0.00192 MB
 Pool ID '17G4SmartVoxelProxy', size : 0.000961 MB
 Pool ID '7G4Event', size : 0.000961 MB
 Pool ID '15G4PrimaryVertex', size : 0.000961 MB
 Pool ID '17G4PrimaryParticle', size : 0.258 MB
-Pool ID '7G4Track', size : 0.792 MB
+Pool ID '7G4Track', size : 0.978 MB
 Pool ID '18G4TouchableHistory', size : 0.000961 MB
 Pool ID '15G4CountedObjectIvE', size : 0.000961 MB
 Pool ID '17G4ReactionProduct', size : 0.00192 MB
 Pool ID '10G4Fragment', size : 0.000961 MB
 Number of memory pools allocated: 13 of which, static: 0
-Dynamic pools deleted: 13 / Total memory freed: 1.5 MB
+Dynamic pools deleted: 13 / Total memory freed: 1.7 MB
 ============================================================
 G4Allocator objects are deleted.
 UImanager deleted.

examples/advanced/air_shower/air_shower.out

@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
 
 
 **************************************************************
- Geant4 version Name: geant4-11-01-patch-02    (15-June-2023)
+ Geant4 version Name: geant4-11-01-patch-03    (10-November-2023)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278
@@ -698,8 +698,8 @@ See commands in /vis/modeling/trajectories/ for other options.
 ooo Run 0 starts (global).
 
 --------- Ranlux engine status ---------
- Initial seed = 1686681308
- float_seed_table[] = 0.24429 0.19203 0.930385 0.579489 0.677383 0.853754 0.255059 0.124678 0.0119871 0.792396 0.137899 0.0594917 0.697128 0.895791 0.221125 0.205631 0.122251 0.805305 0.524881 0.656697 0.105557 0.780275 0.101231 0.763505 
+ Initial seed = 1699447179
+ float_seed_table[] = 0.106417 0.307749 0.437426 0.347998 0.924899 0.965491 0.209033 0.239328 0.65334 0.790675 0.14845 0.0998199 0.294943 0.899389 0.171471 0.277261 0.405963 0.291395 0.00785619 0.439964 0.76048 0.955906 0.75852 0.522929 
  i_lag = 23, j_lag = 9
  carry = 0, count24 = 0
  luxury = 3 nskip = 199
@@ -710,7 +710,7 @@ mu- Mono Plane
  Run terminated.
 Run Summary
   Number of events processed : 100
-  User=2.430000s Real=2.438739s Sys=0.000000s
+  User=2.350000s Real=2.366503s Sys=0.000000s
 ### Run 0 (global) ended.
 Graphics systems deleted.
 Visualization Manager deleting...
@@ -727,23 +727,23 @@ G4SDManager deleted.
 EventManager deleted.
 Units table cleared.
 TransportationManager deleted.
-Total navigation history collections cleaned: 9
+Total navigation history collections cleaned: 10
 G4RNGHelper object is deleted.
 ================== Deleting memory pools ===================
-Pool ID '20G4NavigationLevelRep', size : 0.0115 MB
+Pool ID '20G4NavigationLevelRep', size : 0.0135 MB
 Pool ID '24G4ReferenceCountedHandleIvE', size : 0.000961 MB
-Pool ID '17G4DynamicParticle', size : 0.025 MB
+Pool ID '17G4DynamicParticle', size : 0.024 MB
 Pool ID '16G4SmartVoxelNode', size : 0.00192 MB
 Pool ID '17G4SmartVoxelProxy', 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 '7G4Track', size : 0.05 MB
+Pool ID '7G4Track', size : 0.0471 MB
 Pool ID '18G4TouchableHistory', size : 0.000961 MB
 Pool ID '15G4CountedObjectIvE', size : 0.000961 MB
-Pool ID '15UltraOpticalHit', size : 0.00385 MB
+Pool ID '15UltraOpticalHit', size : 0.00577 MB
 Number of memory pools allocated: 14 of which, static: 0
 Dynamic pools deleted: 14 / Total memory freed: 0.1 MB
 ============================================================

examples/advanced/amsEcal/run1.out

@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
 
 
 **************************************************************
- Geant4 version Name: geant4-11-01-patch-02    (15-June-2023)
+ Geant4 version Name: geant4-11-01-patch-03    (10-November-2023)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278
@@ -187,7 +187,7 @@ N=17 V[N]={906770732717044781, 629165745432651234, 1235682547346241386, 68420008
  Run terminated.
 Run Summary
   Number of events processed : 10000
-  User=6.530000s Real=6.580281s Sys=0.000000s
+  User=6.360000s Real=6.397716s Sys=0.000000s
 
 -------------------------------------------------------------
  ---> The calorimeter is 9 Modules

examples/advanced/brachytherapy/brachytherapy.out

@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
 
 
 **************************************************************
- Geant4 version Name: geant4-11-01-patch-02    (15-June-2023)
+ Geant4 version Name: geant4-11-01-patch-03    (10-November-2023)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278

examples/advanced/composite_calorimeter/composite_calorimeter.out

@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
 
 
 **************************************************************
- Geant4 version Name: geant4-11-01-patch-02    (15-June-2023)
+ Geant4 version Name: geant4-11-01-patch-03    (10-November-2023)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278
@@ -1084,7 +1084,7 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
  Run terminated.
 Run Summary
   Number of events processed : 20
-  User=15.470000s Real=15.602755s Sys=0.010000s
+  User=15.840000s Real=15.973236s Sys=0.010000s
 ### Run 0 end.
 ... write file : ccal.root - done
 ... close file : ccal.root - done