Skip to content

Commit 098f6c7

Browse files
committed
Import Geant4 10.7.4 source tree
1 parent 4317e2b commit 098f6c7

File tree

168 files changed

+22641
-23418
lines changed

Some content is hidden

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

168 files changed

+22641
-23418
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX
3333
project(Geant4)
3434
set(${PROJECT_NAME}_VERSION_MAJOR 10)
3535
set(${PROJECT_NAME}_VERSION_MINOR 7)
36-
set(${PROJECT_NAME}_VERSION_PATCH 3)
36+
set(${PROJECT_NAME}_VERSION_PATCH 4)
3737
set(${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}")
3838

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

CONTRIBUTING.rst

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Contributing to Geant4
22
=====
3-
To contribute patches to Geant4, users can submit Pull Requests (PR) such that:
3+
To contribute patches to Geant4, users can submit normal GitHub Pull Requests (PR) such that:
44

55
- A single PR refers to a single particular topic (fix or suggested enhancement);
66
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
1010
the development repository of Geant4, to be included in a future release or
1111
patch.
1212

13-
For simple bug-fixes, it is anyhow recommended to use the official
14-
Bugzilla problem reporting system.
13+
For simple bug-fixes, it is still recommended to use the official Bugzilla problem reporting system
14+
to report the issue, linking back to the Pull Request if created:
15+
1516
- Problem reports: `Bugzilla problem reporting system <https://bugzilla-geant4.kek.jp>`_.
16-
- User Forum: `Geant4 Forum <https://geant4-forum.web.cern.ch>`_.
17-
- Documentation: `User Documentation <https://cern.ch/geant4/support/user_documentation>`_.
1817

19-
The Geant4 Collaboration
18+
Questions on Geant4 itself or feature requests should be made through our `User Forum <https://geant4-forum.web.cern.ch>`_,
19+
and `full documentation on use of the toolkit is online <https://cern.ch/geant4/support/user_documentation>`_.
20+
21+
The Geant4 Collaboration

README.rst

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,40 @@
11
=====
2-
Geant4: A Simulation Toolkit
2+
Geant4: A Simulation Toolkit
33
=====
44

5-
- Problem reports: `Bugzilla problem reporting system <https://bugzilla-geant4.kek.jp>`_.
6-
- User Forum: `Geant4 Forum <https://geant4-forum.web.cern.ch>`_.
7-
- Documentation: `User Documentation <https://cern.ch/geant4/support/user_documentation>`_.
5+
Geant4 is a toolkit for the simulation of the passage of particles through matter.
6+
Its areas of application include high energy, nuclear and accelerator physics, as well
7+
as studies in medical and space science.
88

9+
For more information about how to use Geant4 and its application domains, please visit
10+
`the Geant4 website <https://cern.ch/geant4>`_
11+
12+
There are three main reference papers for Geant4:
13+
14+
- `Nuclear Instruments and Methods in Physics Research A 835 (2016) 186-225 <http://www.sciencedirect.com/science/article/pii/S0168900216306957>`_
15+
- `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>`_
16+
- `Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303 <http://www.sciencedirect.com/science/article/pii/S0168900203013688>`_
17+
18+
=====
19+
Installation
20+
=====
21+
For detailed instructions on building and installing Geant4, including all
22+
supported platforms and configuration options, please refer to
23+
the `Installation Guide <http://cern.ch/geant4-userdoc/UsersGuides/InstallationGuide/html>`_.
24+
25+
=====
26+
Questions, Bugs, and Requirements
27+
=====
28+
Full documentation on Geant4, including installation, use of the toolkit in applications,
29+
physics lists, and physics model implementations, can be found on the `User Documentation Site <http://cern.ch/geant4/support/user_documentation>`_.
30+
31+
If you have a question about, or issue using, Geant4, please post on our `User Forum <http://cern.ch/geant4-forum>`_
32+
in the Category and Section relevent to your problem. The forum is `fully searchable <http://cern.ch/geant4-forum/search>`_
33+
so it's possible your question may already have been answered.
34+
35+
If you think you have found a bug in Geant4, please open a ticket on our `Bugzilla Tracker <http://bugzilla-geant4.kek.jp>`_.
36+
37+
=====
38+
Contributing to Geant4
39+
=====
40+
Please see the main `Contribution Guide <./CONTRIBUTING.rst>`_.

ReleaseNotes/Patch4.10.7-4.txt

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
2+
Geant4 10.7 - patch-04 Release Notes
3+
------------------------------------
4+
5+
9 September 2022
6+
7+
List of fixes included in this public patch since the public release 10.7.p03:
8+
9+
o Configuration
10+
-------------
11+
+ CMake:
12+
o Update extraction of include paths from VecGeom to use imported target
13+
property. Addressing problem report #2485.
14+
15+
o Global:
16+
------
17+
+ Updated date and version for 10.7.p04.
18+
19+
o Physics Lists:
20+
-------------
21+
+ constructors/electromagnetic
22+
o G4GammaGeneralProcess: fixed problem of Compton scattering selection
23+
in the low energy interval < 150 keV.
24+
25+
o Processes - Electromagnetic:
26+
---------------------------
27+
+ utils
28+
o G4EmExtraParameters: safe definition of StepFuction for G4GenericIon.
29+
Addressing problem report #2495.
30+
o G4EmExtraParametersMessenger: fixed typo.
31+
Addressing problem report #2492.
32+
33+
o Processes - Hadronic:
34+
--------------------
35+
+ cross_sections
36+
o G4ComponentAntiNuclNuclearXS: correct treatment of the cross-sections
37+
of light anti-nuclei on hydrogen target. This relies on the isospin
38+
symmetry assumption, according to which the properties of the reactions
39+
between anti-proton and light nuclei are equivalent to those between
40+
light anti-nuclei and hydrogen.
41+
+ models/coherent_elastic
42+
o G4AntiNuclElastic: correction in SampleInvariantT() method of the
43+
highest momentum transfer (which was causing the cosine of the polar
44+
angle in the center-of-mass system to be larger than 1 in some cases).
45+
Addressing problem report #2204.
46+
+ models/inclxx
47+
o G4INCLXXInterface: fixed treatment of kaon0, anti_kaon0, kaon0L, and
48+
kaon0S. In current reference physics lists, INCLXX is never used for
49+
handling kaons, although it is capable of doing so, but at process-
50+
level or in custom physics lists one could observe crashes when trying
51+
to use INCLXX for neutral kaon projectiles. The change fixes this
52+
misbehavior.
53+
+ models/particle_hp
54+
o Fixed issue for photons too high in energy generated from
55+
G4NDL/Capture/FSMF6 data. Addressing problem report #2468.
56+
o G4ParticleHPContAngularPar: added protections against evaluations of
57+
arrays at negative index (-1), fixing rare reproducibility problems
58+
and rare crashes observed.
59+
o Code cleanup in G4ParticleHPContEnergyAngular and
60+
G4ParticleHPContAngularPar: removed debug and commented out code,
61+
indentation of loops and if branches.
62+
63+
----------------------------------------------------------------------------
64+
65+
Technical Notes
66+
---------------
67+
68+
o This patch should be applied on top of release 10.7 series.
69+
o Technical notes distributed for release 10.7 are also applicable and
70+
valid for this patch.
71+
72+
The code and rebuilt binary libraries for release 10.7.p04 are available
73+
through the Geant4 "Download" Web page.
74+
75+
Please refer to the Geant4 User Documentation for further information about
76+
using Geant4.

cmake/History

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
3030

3131
----------------------------------------------------------
3232

33+
14th July 2022 - Ben Morgan (cmake-V10-06-54)
34+
- Address [Bugzilla 2485](https://bugzilla-geant4.kek.jp/show_bug.cgi?id=2485)
35+
- Update extraction of include paths from VecGeom to use imported target
36+
property.
37+
3338
24th September 2021 - Ben Morgan (cmake-V10-06-53)
3439
- Rename Geant4::HDF5 to hdf5::hdf5 to be compatible with
3540
imported target provided since CMake 3.20.

cmake/Modules/G4ConfigurePkgConfigHelpers.cmake

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,16 +208,13 @@ if(NOT GEANT4_BUILD_GRANULAR_LIBS AND UNIX)
208208
# - USolids
209209
if(GEANT4_USE_USOLIDS OR GEANT4_USE_PARTIAL_USOLIDS)
210210
set(G4_BUILTWITH_USOLIDS "yes")
211-
set(G4_USOLIDS_INCLUDE_DIRS "${USOLIDS_INCLUDE_DIRS} ${VECGEOM_EXTERNAL_INCLUDES}")
211+
get_target_property(G4_USOLIDS_INCLUDE_DIRS VecGeom::vecgeom INTERFACE_INCLUDE_DIRECTORIES)
212212
list(REMOVE_DUPLICATES G4_USOLIDS_INCLUDE_DIRS)
213-
if(_cxx_compiler_dirs)
214-
list(REMOVE_ITEM G4_USOLIDS_INCLUDE_DIRS ${_cxx_compiler_dirs})
215-
endif()
216-
217-
string(REPLACE ";" " " G4_USOLIDS_CFLAGS "${VECGEOM_DEFINITIONS}")
218213
foreach(_dir ${G4_USOLIDS_INCLUDE_DIRS})
219214
set(G4_USOLIDS_CFLAGS "${G4_USOLIDS_CFLAGS} -I${_dir}")
220215
endforeach()
216+
# NB: should ALSO account for VecGeom having compile_options, but
217+
# this is better handled through proper pkg-config support
221218
else()
222219
set(G4_BUILTWITH_USOLIDS "no")
223220
endif()

examples/advanced/ChargeExchangeMC/ChargeExchangeMC.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
############################################
55

66
**************************************************************
7-
Geant4 version Name: geant4-10-07-patch-03 (19-November-2021)
7+
Geant4 version Name: geant4-10-07-patch-04 (9-September-2022)
88
Copyright : Geant4 Collaboration
99
References : NIM A 506 (2003), 250-303
1010
: IEEE-TNS 53 (2006), 270-278
@@ -1357,7 +1357,7 @@ Event 17673
13571357
Run terminated.
13581358
Run Summary
13591359
Number of events processed : 17674, effectively: 10
1360-
User=14.780000s Real=16.507339s Sys=0.000000s
1360+
User=15.840000s Real=16.441131s Sys=0.000000s
13611361

13621362
--- Setup acceptances (range | real (trg / mon) | rec (trg / mon / all)):
13631363
1 [ 1.0000, 0.8000) | 0.00210084 ( 1 / 476 ) | 0.00000000 ( 0 / 476 / 581 )

examples/advanced/air_shower/air_shower.out

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
55
############################################
66

77
**************************************************************
8-
Geant4 version Name: geant4-10-07-patch-03 (19-November-2021)
8+
Geant4 version Name: geant4-10-07-patch-04 (9-September-2022)
99
Copyright : Geant4 Collaboration
1010
References : NIM A 506 (2003), 250-303
1111
: IEEE-TNS 53 (2006), 270-278
@@ -90,12 +90,10 @@ Registered graphics systems are:
9090
VRML1FILE (VRML1FILE)
9191
VRML2FILE (VRML2FILE)
9292
gMocrenFile (gMocrenFile)
93-
OpenGLImmediateQt (OGLIQt, OGLI)
94-
OpenGLStoredQt (OGLSQt, OGL, OGLS)
95-
OpenGLImmediateXm (OGLIXm, OGLIQt_FALLBACK)
96-
OpenGLStoredXm (OGLSXm, OGLSQt_FALLBACK)
97-
OpenGLImmediateX (OGLIX, OGLIQt_FALLBACK, OGLIXm_FALLBACK)
98-
OpenGLStoredX (OGLSX, OGLSQt_FALLBACK, OGLSXm_FALLBACK)
93+
OpenGLImmediateXm (OGLIXm, OGLI)
94+
OpenGLStoredXm (OGLSXm, OGL, OGLS)
95+
OpenGLImmediateX (OGLIX, OGLIXm_FALLBACK)
96+
OpenGLStoredX (OGLSX, OGLSXm_FALLBACK)
9997
RayTracerX (RayTracerX)
10098

10199
Registering model factories...
@@ -620,8 +618,8 @@ See commands in /vis/modeling/trajectories/ for other options.
620618
ooo Run 0 starts (global).
621619

622620
--------- Ranlux engine status ---------
623-
Initial seed = 1637157527
624-
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
621+
Initial seed = 1662627705
622+
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
625623
i_lag = 23, j_lag = 9
626624
carry = 0, count24 = 0
627625
luxury = 3 nskip = 199
@@ -632,7 +630,7 @@ mu- Mono Plane
632630
Run terminated.
633631
Run Summary
634632
Number of events processed : 100
635-
User=1.890000s Real=2.086444s Sys=0.010000s
633+
User=2.480000s Real=2.632633s Sys=0.000000s
636634
### Run 0 (global) ended.
637635
0 events have been kept for refreshing and/or reviewing.
638636
"/vis/reviewKeptEvents" to review them one by one.
@@ -650,22 +648,22 @@ G4SDManager deleted.
650648
EventManager deleted.
651649
Units table cleared.
652650
TransportationManager deleted.
653-
Total navigation history collections cleaned: 10
651+
Total navigation history collections cleaned: 9
654652
================== Deleting memory pools ===================
655-
Pool ID '20G4NavigationLevelRep', size : 0.0135 MB
653+
Pool ID '20G4NavigationLevelRep', size : 0.0115 MB
656654
Pool ID '24G4ReferenceCountedHandleIvE', size : 0.000961 MB
657655
Pool ID '7G4Event', size : 0.000961 MB
658656
Pool ID '15G4PrimaryVertex', size : 0.000961 MB
659657
Pool ID '17G4PrimaryParticle', size : 0.000961 MB
660658
Pool ID '15G4HCofThisEvent', size : 0.000961 MB
661659
Pool ID '16G4HitsCollection', size : 0.000961 MB
662-
Pool ID '17G4DynamicParticle', size : 0.024 MB
663-
Pool ID '7G4Track', size : 0.0481 MB
660+
Pool ID '17G4DynamicParticle', size : 0.026 MB
661+
Pool ID '7G4Track', size : 0.0509 MB
664662
Pool ID '18G4TouchableHistory', size : 0.000961 MB
665663
Pool ID '15G4CountedObjectIvE', size : 0.000961 MB
666-
Pool ID '15UltraOpticalHit', size : 0.00481 MB
664+
Pool ID '15UltraOpticalHit', size : 0.00385 MB
667665
Number of memory pools allocated: 12 of which, static: 0
668-
Dynamic pools deleted: 12 / Total memory freed: 0.098 MB
666+
Dynamic pools deleted: 12 / Total memory freed: 0.1 MB
669667
============================================================
670668
G4Allocator objects are deleted.
671669
UImanager deleted.

examples/advanced/amsEcal/run1.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
############################################
55

66
**************************************************************
7-
Geant4 version Name: geant4-10-07-patch-03 (19-November-2021)
7+
Geant4 version Name: geant4-10-07-patch-04 (9-September-2022)
88
Copyright : Geant4 Collaboration
99
References : NIM A 506 (2003), 250-303
1010
: IEEE-TNS 53 (2006), 270-278
@@ -179,7 +179,7 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
179179
Run terminated.
180180
Run Summary
181181
Number of events processed : 10000
182-
User=6.720000s Real=7.969201s Sys=0.000000s
182+
User=6.740000s Real=6.840456s Sys=0.000000s
183183

184184
-------------------------------------------------------------
185185
---> The calorimeter is 9 Modules

examples/advanced/brachytherapy/brachytherapy.out

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
55
############################################
66

77
**************************************************************
8-
Geant4 version Name: geant4-10-07-patch-03 (19-November-2021)
8+
Geant4 version Name: geant4-10-07-patch-04 (9-September-2022)
99
Copyright : Geant4 Collaboration
1010
References : NIM A 506 (2003), 250-303
1111
: IEEE-TNS 53 (2006), 270-278
@@ -30,12 +30,10 @@ Registered graphics systems are:
3030
VRML1FILE (VRML1FILE)
3131
VRML2FILE (VRML2FILE)
3232
gMocrenFile (gMocrenFile)
33-
OpenGLImmediateQt (OGLIQt, OGLI)
34-
OpenGLStoredQt (OGLSQt, OGL, OGLS)
35-
OpenGLImmediateXm (OGLIXm, OGLIQt_FALLBACK)
36-
OpenGLStoredXm (OGLSXm, OGLSQt_FALLBACK)
37-
OpenGLImmediateX (OGLIX, OGLIQt_FALLBACK, OGLIXm_FALLBACK)
38-
OpenGLStoredX (OGLSX, OGLSQt_FALLBACK, OGLSXm_FALLBACK)
33+
OpenGLImmediateXm (OGLIXm, OGLI)
34+
OpenGLStoredXm (OGLSXm, OGL, OGLS)
35+
OpenGLImmediateX (OGLIX, OGLIXm_FALLBACK)
36+
OpenGLStoredX (OGLSX, OGLSXm_FALLBACK)
3937
RayTracerX (RayTracerX)
4038

4139
Registering model factories...
@@ -384,7 +382,7 @@ msc: for GenericIon SubType= 10
384382
ionIoni: for GenericIon SubType=2
385383
dE/dx and range tables from 100 eV to 100 TeV in 240 bins
386384
Lambda tables from threshold to 100 TeV, 20 bins/decade, spline: 1
387-
StepFunction=(0.1, 0.02 mm), integ: 1, fluct: 1, linLossLim= 0.02
385+
StepFunction=(0.1, 0.001 mm), integ: 1, fluct: 1, linLossLim= 0.02
388386
===== EM models for the G4Region DefaultRegionForTheWorld ======
389387
ParamICRU73 : Emin= 0 eV Emax= 100 TeV deltaVI
390388

examples/advanced/composite_calorimeter/composite_calorimeter.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
############################################
55

66
**************************************************************
7-
Geant4 version Name: geant4-10-07-patch-03 (19-November-2021)
7+
Geant4 version Name: geant4-10-07-patch-04 (9-September-2022)
88
Copyright : Geant4 Collaboration
99
References : NIM A 506 (2003), 250-303
1010
: IEEE-TNS 53 (2006), 270-278
@@ -956,7 +956,7 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics
956956
Run terminated.
957957
Run Summary
958958
Number of events processed : 20
959-
User=18.130000s Real=20.878516s Sys=0.000000s
959+
User=17.620000s Real=18.291065s Sys=0.000000s
960960
### Run 0 end.
961961
... write file : ccal.root - done
962962
... close file : ccal.root - done
@@ -972,23 +972,23 @@ G4SDManager deleted.
972972
EventManager deleted.
973973
Units table cleared.
974974
TransportationManager deleted.
975-
Total navigation history collections cleaned: 47
975+
Total navigation history collections cleaned: 46
976976
================== Deleting memory pools ===================
977-
Pool ID '20G4NavigationLevelRep', size : 0.0692 MB
977+
Pool ID '20G4NavigationLevelRep', size : 0.0683 MB
978978
Pool ID '24G4ReferenceCountedHandleIvE', size : 0.000961 MB
979979
Pool ID '7G4Event', size : 0.000961 MB
980980
Pool ID '15G4PrimaryVertex', size : 0.000961 MB
981981
Pool ID '17G4PrimaryParticle', size : 0.000961 MB
982982
Pool ID '15G4HCofThisEvent', size : 0.000961 MB
983983
Pool ID '16G4HitsCollection', size : 0.000961 MB
984-
Pool ID '17G4DynamicParticle', size : 0.0538 MB
985-
Pool ID '7G4Track', size : 0.107 MB
984+
Pool ID '17G4DynamicParticle', size : 0.049 MB
985+
Pool ID '7G4Track', size : 0.0971 MB
986986
Pool ID '18G4TouchableHistory', size : 0.00577 MB
987987
Pool ID '15G4CountedObjectIvE', size : 0.000961 MB
988-
Pool ID '17G4ReactionProduct', size : 0.0125 MB
988+
Pool ID '17G4ReactionProduct', size : 0.0135 MB
989989
Pool ID '10G4Fragment', size : 0.00481 MB
990990
Number of memory pools allocated: 13 of which, static: 0
991-
Dynamic pools deleted: 13 / Total memory freed: 0.26 MB
991+
Dynamic pools deleted: 13 / Total memory freed: 0.25 MB
992992
============================================================
993993
G4Allocator objects are deleted.
994994
UImanager deleted.

examples/advanced/eRosita/eRosita.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
############################################
55

66
**************************************************************
7-
Geant4 version Name: geant4-10-07-patch-03 (19-November-2021)
7+
Geant4 version Name: geant4-10-07-patch-04 (9-September-2022)
88
Copyright : Geant4 Collaboration
99
References : NIM A 506 (2003), 250-303
1010
: IEEE-TNS 53 (2006), 270-278
@@ -200,4 +200,4 @@ Index : 2 used in the geometry : Yes
200200
---- eRosita event counter: 9000
201201
---- eRosita event counter: 10000
202202
--- Run 00 ends (Number of events = 10000).
203-
User=33.610000s Real=38.983869s Sys=0.020000s
203+
User=33.730000s Real=34.800651s Sys=0.010000s

0 commit comments

Comments
 (0)