Skip to content

Commit ee63be6

Browse files
gcosmogcosmo
committed
Import Geant4 11.1.3 source tree
1 parent cf4c671 commit ee63be6

File tree

243 files changed

+21513
-19236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+21513
-19236
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#======================================================================
1111

1212
# ignore any hidden clang-format files
13-
*/.clang-format
1413
/format-original.txt
1514
/format-modified.txt
1615

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ project(Geant4
3131
HOMEPAGE_URL "https://geant4.cern.ch")
3232
set(${PROJECT_NAME}_VERSION_MAJOR 11)
3333
set(${PROJECT_NAME}_VERSION_MINOR 1)
34-
set(${PROJECT_NAME}_VERSION_PATCH 2)
34+
set(${PROJECT_NAME}_VERSION_PATCH 3)
3535
set(${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}")
3636

3737
# - Prepend our own CMake Modules to the search path

‎ReleaseNotes/Patch.11.1-3.txt

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
2+
Geant4 11.1 - patch-03 Release Notes
3+
------------------------------------
4+
5+
10 November 2023
6+
7+
List of fixes included in this public patch since the public release 11.1.2:
8+
9+
o Configuration:
10+
-------------
11+
+ CMake
12+
o Export non-cache variables to Geant4PackageCache to support CMake>=3.27.
13+
Addresses problem report #2556.
14+
15+
o Externals:
16+
---------
17+
+ CLHEP
18+
o Added missing shootArray() implementation in RandPoissonQ.
19+
+ G4tools
20+
o Updated to version 6.1.1; fixed compilation warnings on Intel/icx
21+
compiler and clang-15.
22+
+ PTL
23+
o Disabled optimization of ThreadPool::execute_thread() on Apple/Intel
24+
builds. Addressing problem report #2564.
25+
26+
o Global:
27+
------
28+
+ Updated date and version for 11.1.3.
29+
30+
o Intercoms:
31+
---------
32+
+ Added missing converter LtoS() in G4UImessenger.
33+
34+
o Physics Lists:
35+
-------------
36+
+ constructors/decay
37+
o G4RadioactiveDecayPhysics: replaced G4RadioactiveDecay with
38+
G4Radioactivation to allow running also in biasing mode.
39+
40+
o Processes - Electromagnetic:
41+
---------------------------
42+
+ dna
43+
o Use std::erfc() to avoid precision loss.
44+
Fix imported from GitHub PR#58 (https://github.com/Geant4/geant4/pull/58).
45+
o Removed unused header inclusion.
46+
+ low energy
47+
o Fix for (rare) infinite loops in G4PenelopeComptonModel.
48+
Reported in GitHub PR#61 (https://github.com/Geant4/geant4/pull/61).
49+
+ utils
50+
o In G4TransportationWithMsc, always update momentum direction.
51+
o Fixed computation of Birks saturation for compounds in G4EmSaturation.
52+
Addressing problem report #2572.
53+
+ xrays
54+
o Added protection against potential infinite loops in G4Cerenkov.
55+
Addressing problem report #2555.
56+
57+
o Examples:
58+
--------
59+
+ extended/parameterisations/Par04
60+
o Bump tensorflow to 2.11.1.
61+
Fixes GitHub PR#55 (https://github.com/Geant4/geant4/pull/55)
62+
and GitHub PR#60 (https://github.com/Geant4/geant4/pull/60).
63+
64+
----------------------------------------------------------------------------
65+
66+
Technical Notes
67+
---------------
68+
69+
o This patch should be applied on top of release 11.1 series.
70+
o Technical notes distributed for release 11.1 are also applicable and
71+
valid for this patch.
72+
73+
The code and rebuilt binary libraries for release 11.1.3 are available
74+
through the Geant4 "Download" Web page.
75+
76+
Please refer to the Geant4 User Documentation for further information about
77+
using Geant4.

‎cmake/History

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ It must **not** be used as a substitute for writing good git commit messages!
66

77
-------------------------------------------------------------------------------
88

9+
## 2023-08-24 Ben Morgan (cmake-V11-00-54)
10+
- Export non-cache variables to Geant4PackageCache to support CMake>=3.27
11+
- Fixes Bugzilla 2556
12+
913
## 2023-02-06 Ben Morgan (cmake-V11-00-53)
1014
- Remove no longer required G4VecGeomShim module.
1115
- VecGeom supports/supplies full imported targets since 1.1.18

‎cmake/Modules/G4CMakeUtilities.cmake

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

‎cmake/Modules/G4OptionalComponents.cmake

+3-1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ else()
7878
unset(EXPAT_FOUND)
7979
unset(EXPAT_INCLUDE_DIR CACHE)
8080
unset(EXPAT_LIBRARY CACHE)
81+
unset(EXPAT_LIBRARY_RELEASE CACHE)
82+
unset(EXPAT_LIBRARY_DEBUG CACHE)
8183
message(FATAL_ERROR
8284
"Detected system expat header and library:
8385
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
8890

8991
# Backward compatibility for sources.cmake using the variable
9092
set(EXPAT_LIBRARIES EXPAT::EXPAT)
91-
geant4_save_package_variables(EXPAT EXPAT_INCLUDE_DIR EXPAT_LIBRARY)
93+
geant4_save_package_variables(EXPAT EXPAT_INCLUDE_DIR EXPAT_LIBRARY EXPAT_LIBRARY_RELEASE EXPAT_LIBRARY_DEBUG)
9294
else()
9395
set(EXPAT_FOUND TRUE)
9496
set(GEANT4_USE_BUILTIN_EXPAT TRUE)

‎examples/advanced/CaTS/CaTS.out

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
3838

3939

4040
**************************************************************
41-
Geant4 version Name: geant4-11-01-patch-02 (15-June-2023)
41+
Geant4 version Name: geant4-11-01-patch-03 (10-November-2023)
4242
Copyright : Geant4 Collaboration
4343
References : NIM A 506 (2003), 250-303
4444
: IEEE-TNS 53 (2006), 270-278
@@ -911,4 +911,4 @@ Correlated gamma emission flag 0
911911
Max 2J for sampling of angular correlations 10
912912
=======================================================================
913913
writing Event: 0
914-
TimeTotal> 5.254 2.780
914+
TimeTotal> 3.231 2.530

‎examples/advanced/ChargeExchangeMC/ChargeExchangeMC.out

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111

1212
**************************************************************
13-
Geant4 version Name: geant4-11-01-patch-02 (15-June-2023)
13+
Geant4 version Name: geant4-11-01-patch-03 (10-November-2023)
1414
Copyright : Geant4 Collaboration
1515
References : NIM A 506 (2003), 250-303
1616
: IEEE-TNS 53 (2006), 270-278
@@ -1533,7 +1533,7 @@ Event 19509
15331533
Run terminated.
15341534
Run Summary
15351535
Number of events processed : 19510, effectively: 10
1536-
User=14.320000s Real=14.449986s Sys=0.000000s
1536+
User=14.800000s Real=14.955140s Sys=0.010000s
15371537

15381538
--- Setup acceptances (range | real (trg / mon) | rec (trg / mon / all)):
15391539
1 [ 1.0000, 0.8000) | 0.00000000 ( 0 / 528 ) | 0.00000000 ( 0 / 528 / 648 )

‎examples/advanced/HGCal_testbeam/testbeam_electron.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
1111

1212

1313
**************************************************************
14-
Geant4 version Name: geant4-11-01-patch-02 (15-June-2023)
14+
Geant4 version Name: geant4-11-01-patch-03 (10-November-2023)
1515
Copyright : Geant4 Collaboration
1616
References : NIM A 506 (2003), 250-303
1717
: IEEE-TNS 53 (2006), 270-278

‎examples/advanced/ICRP110_HumanPhantoms/ICRP110Phantoms.out

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
1111

1212

1313
**************************************************************
14-
Geant4 version Name: geant4-11-01-patch-02 (15-June-2023)
14+
Geant4 version Name: geant4-11-01-patch-03 (10-November-2023)
1515
Copyright : Geant4 Collaboration
1616
References : NIM A 506 (2003), 250-303
1717
: IEEE-TNS 53 (2006), 270-278
@@ -707,9 +707,9 @@ Threshold for very long decay time at rest 3.171e+10 y
707707
Cr_sctns: Glauber-Gribov Nucl-nucl: 0 eV ---> 25.6 PeV
708708

709709

710-
Process: RadioactiveDecay
710+
Process: Radioactivation
711711

712-
Process: RadioactiveDecay
712+
Process: Radioactivation
713713

714714
---------------------------------------------------
715715
Hadronic Processes for He3

‎examples/advanced/ICRP145_HumanPhantoms/ICRP145Phantoms.out

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
1111

1212

1313
**************************************************************
14-
Geant4 version Name: geant4-11-01-patch-02 (15-June-2023)
14+
Geant4 version Name: geant4-11-01-patch-03 (10-November-2023)
1515
Copyright : Geant4 Collaboration
1616
References : NIM A 506 (2003), 250-303
1717
: IEEE-TNS 53 (2006), 270-278
@@ -843,9 +843,9 @@ Threshold for very long decay time at rest 31709791983.76459 y
843843
Cr_sctns: Glauber-Gribov Nucl-nucl: 0.000000 eV ---> 25.600000 PeV
844844

845845

846-
Process: RadioactiveDecay
846+
Process: Radioactivation
847847

848-
Process: RadioactiveDecay
848+
Process: Radioactivation
849849

850850
---------------------------------------------------
851851
Hadronic Processes for He3

‎examples/advanced/STCyclotron/STCyclotron.out

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
1111

1212

1313
**************************************************************
14-
Geant4 version Name: geant4-11-01-patch-02 (15-June-2023)
14+
Geant4 version Name: geant4-11-01-patch-03 (10-November-2023)
1515
Copyright : Geant4 Collaboration
1616
References : NIM A 506 (2003), 250-303
1717
: IEEE-TNS 53 (2006), 270-278
@@ -542,7 +542,7 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
542542
Run terminated.
543543
Run Summary
544544
Number of events processed : 10
545-
User=21.280000s Real=21.426749s Sys=0.000000s
545+
User=21.170000s Real=21.365981s Sys=0.010000s
546546
... write file : SolidTargetCyclotron.root - done
547547
... close file : SolidTargetCyclotron.root - done
548548
G4 kernel has come to Quit state.
@@ -558,24 +558,24 @@ G4SDManager deleted.
558558
EventManager deleted.
559559
Units table cleared.
560560
TransportationManager deleted.
561-
Total navigation history collections cleaned: 11
561+
Total navigation history collections cleaned: 10
562562
G4RNGHelper object is deleted.
563563
================== Deleting memory pools ===================
564-
Pool ID '20G4NavigationLevelRep', size : 0.0154 MB
564+
Pool ID '20G4NavigationLevelRep', size : 0.0135 MB
565565
Pool ID '24G4ReferenceCountedHandleIvE', size : 0.000961 MB
566-
Pool ID '17G4DynamicParticle', size : 0.396 MB
566+
Pool ID '17G4DynamicParticle', size : 0.489 MB
567567
Pool ID '16G4SmartVoxelNode', size : 0.00192 MB
568568
Pool ID '17G4SmartVoxelProxy', size : 0.000961 MB
569569
Pool ID '7G4Event', size : 0.000961 MB
570570
Pool ID '15G4PrimaryVertex', size : 0.000961 MB
571571
Pool ID '17G4PrimaryParticle', size : 0.258 MB
572-
Pool ID '7G4Track', size : 0.792 MB
572+
Pool ID '7G4Track', size : 0.978 MB
573573
Pool ID '18G4TouchableHistory', size : 0.000961 MB
574574
Pool ID '15G4CountedObjectIvE', size : 0.000961 MB
575575
Pool ID '17G4ReactionProduct', size : 0.00192 MB
576576
Pool ID '10G4Fragment', size : 0.000961 MB
577577
Number of memory pools allocated: 13 of which, static: 0
578-
Dynamic pools deleted: 13 / Total memory freed: 1.5 MB
578+
Dynamic pools deleted: 13 / Total memory freed: 1.7 MB
579579
============================================================
580580
G4Allocator objects are deleted.
581581
UImanager deleted.

‎examples/advanced/air_shower/air_shower.out

+9-9
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
1111

1212

1313
**************************************************************
14-
Geant4 version Name: geant4-11-01-patch-02 (15-June-2023)
14+
Geant4 version Name: geant4-11-01-patch-03 (10-November-2023)
1515
Copyright : Geant4 Collaboration
1616
References : NIM A 506 (2003), 250-303
1717
: IEEE-TNS 53 (2006), 270-278
@@ -698,8 +698,8 @@ See commands in /vis/modeling/trajectories/ for other options.
698698
ooo Run 0 starts (global).
699699

700700
--------- Ranlux engine status ---------
701-
Initial seed = 1686681308
702-
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
701+
Initial seed = 1699447179
702+
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
703703
i_lag = 23, j_lag = 9
704704
carry = 0, count24 = 0
705705
luxury = 3 nskip = 199
@@ -710,7 +710,7 @@ mu- Mono Plane
710710
Run terminated.
711711
Run Summary
712712
Number of events processed : 100
713-
User=2.430000s Real=2.438739s Sys=0.000000s
713+
User=2.350000s Real=2.366503s Sys=0.000000s
714714
### Run 0 (global) ended.
715715
Graphics systems deleted.
716716
Visualization Manager deleting...
@@ -727,23 +727,23 @@ G4SDManager deleted.
727727
EventManager deleted.
728728
Units table cleared.
729729
TransportationManager deleted.
730-
Total navigation history collections cleaned: 9
730+
Total navigation history collections cleaned: 10
731731
G4RNGHelper object is deleted.
732732
================== Deleting memory pools ===================
733-
Pool ID '20G4NavigationLevelRep', size : 0.0115 MB
733+
Pool ID '20G4NavigationLevelRep', size : 0.0135 MB
734734
Pool ID '24G4ReferenceCountedHandleIvE', size : 0.000961 MB
735-
Pool ID '17G4DynamicParticle', size : 0.025 MB
735+
Pool ID '17G4DynamicParticle', size : 0.024 MB
736736
Pool ID '16G4SmartVoxelNode', size : 0.00192 MB
737737
Pool ID '17G4SmartVoxelProxy', size : 0.000961 MB
738738
Pool ID '7G4Event', size : 0.000961 MB
739739
Pool ID '15G4PrimaryVertex', size : 0.000961 MB
740740
Pool ID '17G4PrimaryParticle', size : 0.000961 MB
741741
Pool ID '15G4HCofThisEvent', size : 0.000961 MB
742742
Pool ID '16G4HitsCollection', size : 0.000961 MB
743-
Pool ID '7G4Track', size : 0.05 MB
743+
Pool ID '7G4Track', size : 0.0471 MB
744744
Pool ID '18G4TouchableHistory', size : 0.000961 MB
745745
Pool ID '15G4CountedObjectIvE', size : 0.000961 MB
746-
Pool ID '15UltraOpticalHit', size : 0.00385 MB
746+
Pool ID '15UltraOpticalHit', size : 0.00577 MB
747747
Number of memory pools allocated: 14 of which, static: 0
748748
Dynamic pools deleted: 14 / Total memory freed: 0.1 MB
749749
============================================================

‎examples/advanced/amsEcal/run1.out

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
1111

1212

1313
**************************************************************
14-
Geant4 version Name: geant4-11-01-patch-02 (15-June-2023)
14+
Geant4 version Name: geant4-11-01-patch-03 (10-November-2023)
1515
Copyright : Geant4 Collaboration
1616
References : NIM A 506 (2003), 250-303
1717
: IEEE-TNS 53 (2006), 270-278
@@ -187,7 +187,7 @@ N=17 V[N]={906770732717044781, 629165745432651234, 1235682547346241386, 68420008
187187
Run terminated.
188188
Run Summary
189189
Number of events processed : 10000
190-
User=6.530000s Real=6.580281s Sys=0.000000s
190+
User=6.360000s Real=6.397716s Sys=0.000000s
191191

192192
-------------------------------------------------------------
193193
---> The calorimeter is 9 Modules

‎examples/advanced/brachytherapy/brachytherapy.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
1111

1212

1313
**************************************************************
14-
Geant4 version Name: geant4-11-01-patch-02 (15-June-2023)
14+
Geant4 version Name: geant4-11-01-patch-03 (10-November-2023)
1515
Copyright : Geant4 Collaboration
1616
References : NIM A 506 (2003), 250-303
1717
: IEEE-TNS 53 (2006), 270-278

‎examples/advanced/composite_calorimeter/composite_calorimeter.out

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
1111

1212

1313
**************************************************************
14-
Geant4 version Name: geant4-11-01-patch-02 (15-June-2023)
14+
Geant4 version Name: geant4-11-01-patch-03 (10-November-2023)
1515
Copyright : Geant4 Collaboration
1616
References : NIM A 506 (2003), 250-303
1717
: IEEE-TNS 53 (2006), 270-278
@@ -1084,7 +1084,7 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
10841084
Run terminated.
10851085
Run Summary
10861086
Number of events processed : 20
1087-
User=15.470000s Real=15.602755s Sys=0.010000s
1087+
User=15.840000s Real=15.973236s Sys=0.010000s
10881088
### Run 0 end.
10891089
... write file : ccal.root - done
10901090
... close file : ccal.root - done

0 commit comments

Comments
 (0)