Skip to content

Commit 3136fa9

Browse files
gcosmogcosmo
committed
Import Geant4 11.0.3 source tree
1 parent 2dc4baa commit 3136fa9

File tree

222 files changed

+49240
-46571
lines changed

Some content is hidden

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

222 files changed

+49240
-46571
lines changed

‎CMakeLists.txt

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

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

‎ReleaseNotes/Patch.11.0-3.txt

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
2+
Geant4 11.0 - patch-03 Release Notes
3+
------------------------------------
4+
5+
16 September 2022
6+
7+
List of fixes included in this public patch since the public release 11.0.2:
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 Geometry:
16+
--------
17+
+ management:
18+
o Added protection in G4GeometryManager for Open/CloseGeometry() to
19+
be executed only by master thread. Addressing problem report #2502.
20+
21+
o Global:
22+
------
23+
+ Commented out debug printout in G4ThreadLocalSingleton method.
24+
+ Updated date and version for 11.0.3.
25+
26+
o Parameterisations:
27+
-----------------
28+
+ gflash:
29+
o GFlashHitMaker: fix to make it compatible with command-based scorer.
30+
31+
o Particles:
32+
---------
33+
+ Fixes for transportation of hypernuclei and anti-hypernuclei: in G4Ion,
34+
set (forgotten) 'isGeneralIon' to false for hypernuclei and
35+
anti-hypernuclei, to avoid they get assigned same processes as
36+
'GenericIon'.
37+
In G4DoubleHyperDoubleNeutron and G4AntiDoubleHyperDoubleNeutron, added
38+
(forgotten) call to SetDecayTable(), to have the decay table defined for
39+
these particles.
40+
In G4ParticleDefinition, protect methods GetNumberOfLambdasInHypernucleus()
41+
and GetNumberOfAntiLambdasInAntiHypernucleus() against baryonic resonances
42+
with high spins (such as N(2220), N(2250) and their anti-particles) which
43+
have 8-digits PDG codes, but which are not hypernuclei or anti-hypernuclei.
44+
45+
o Physics Lists:
46+
-------------
47+
+ constructors/electromagnetic
48+
o G4GammaGeneralProcess: fixed problem of Compton scattering selection
49+
in the low energy interval < 150 keV.
50+
51+
o Processes - Electromagnetic:
52+
---------------------------
53+
+ utils
54+
o G4EmExtraParametersMessenger: fixed typo.
55+
Addressing problem report #2492.
56+
57+
o Processes - Generic:
58+
-------------------
59+
+ cuts
60+
o G4VRangeToEnergyConverter: fixed static methods to provide correct
61+
initialisation of energy limits.
62+
63+
o Processes - Hadronic:
64+
--------------------
65+
+ models/particle_hp
66+
o G4ParticleHPInelastic, G4ParticleHPCapture, G4ParticleHPFission,
67+
G4ParticleHPElastic, G4ParticleHPThermalScattering: replaced the
68+
threshold used for checking the absolute energy non-conservation from
69+
DLB_MAX (implying no checking at all) to 350 GeV (this value allows for
70+
cases where the residual nucleus is not produced, even when super-heavy
71+
nuclides are involved).
72+
o G4ParticleHPContAngularPar: added protections against evaluations of
73+
arrays at negative index (-1), fixing rare reproducibility problems.
74+
+ models/parton_string
75+
o Fixes to get isotropic distributions in annihilations at rest: in
76+
G4DiffractiveSplitableHadron, set proper parton index.
77+
In G4DiffractiveExcitation, in the CreateStrings() method, take into
78+
account that strings are created in G4FTFAnnihilation; by default, the
79+
method CreateStrings() creates a string from a wounded nucleon/hadron,
80+
but this is not needed in the case of annihilation.
81+
In G4FTFAnnihilation, removed splitting of hadron; fixed bugs in the
82+
calculations of kinematical properties; set quark momenta at string
83+
ends, to properly account for string order on rapidity.
84+
o G4VSplitableHadron: changed the method Splitting() from "protected" to
85+
"public" (needed to change the status of SplitableHadron in
86+
G4FTFAnnihilation, to get isotropic distributions in annihilations
87+
at rest).
88+
89+
o Track:
90+
-----
91+
+ G4Step: added ResetPre/PostStepPoint() methods to replace a StepPoint
92+
without deleting the previous object.
93+
94+
----------------------------------------------------------------------------
95+
96+
Technical Notes
97+
---------------
98+
99+
o This patch should be applied on top of release 11.0 series.
100+
o Technical notes distributed for release 11.0 are also applicable and
101+
valid for this patch.
102+
103+
The code and rebuilt binary libraries for release 11.0.3 are available
104+
through the Geant4 "Download" Web page.
105+
106+
Please refer to the Geant4 User Documentation for further information about
107+
using Geant4.

‎ReleaseNotes/Patch4.10.7-4.txt

+76
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

+5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
2929
* Reverse chronological order (last date on top), please *
3030
----------------------------------------------------------
3131

32+
14 July 2022 - Ben Morgan (cmake-V10-07-57)
33+
- Address [Bugzilla 2485](https://bugzilla-geant4.kek.jp/show_bug.cgi?id=2485)
34+
- Update extraction of include paths from VecGeom to use imported target
35+
property.
36+
3237
06 April 2022 - Ben Morgan (cmake-V10-07-56)
3338
- Don't add CLHEP_INCLUDE_DIRS directly through include_directories to prevent potential
3439
issues with it holding relative paths (reported by Seth Johnson)

‎cmake/Modules/G4ConfigurePkgConfigHelpers.cmake

+3-6
Original file line numberDiff line numberDiff line change
@@ -214,16 +214,13 @@ if(NOT GEANT4_BUILD_GRANULAR_LIBS)
214214
# - USolids
215215
if(GEANT4_USE_USOLIDS OR GEANT4_USE_PARTIAL_USOLIDS)
216216
set(G4_BUILTWITH_USOLIDS "yes")
217-
set(G4_USOLIDS_INCLUDE_DIRS "${USOLIDS_INCLUDE_DIRS} ${VECGEOM_EXTERNAL_INCLUDES}")
217+
get_target_property(G4_USOLIDS_INCLUDE_DIRS VecGeom::vecgeom INTERFACE_INCLUDE_DIRECTORIES)
218218
list(REMOVE_DUPLICATES G4_USOLIDS_INCLUDE_DIRS)
219-
if(_cxx_compiler_dirs)
220-
list(REMOVE_ITEM G4_USOLIDS_INCLUDE_DIRS ${_cxx_compiler_dirs})
221-
endif()
222-
223-
string(REPLACE ";" " " G4_USOLIDS_CFLAGS "${VECGEOM_DEFINITIONS}")
224219
foreach(_dir ${G4_USOLIDS_INCLUDE_DIRS})
225220
set(G4_USOLIDS_CFLAGS "${G4_USOLIDS_CFLAGS} -I${_dir}")
226221
endforeach()
222+
# NB: should ALSO account for VecGeom having compile_options, but
223+
# this is better handled through proper pkg-config support
227224
else()
228225
set(G4_BUILTWITH_USOLIDS "no")
229226
endif()

0 commit comments

Comments
 (0)