Skip to content

Commit 4317e2b

Browse files
gcosmogcosmo
committed
Import Geant4 10.7.3 source tree
1 parent 1326130 commit 4317e2b

File tree

243 files changed

+32386
-29746
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

+32386
-29746
lines changed

‎CMakeLists.txt

+1-1
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 2)
36+
set(${PROJECT_NAME}_VERSION_PATCH 3)
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

‎ReleaseNotes/Patch4.10.7-3.txt

+158
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
1+
2+
Geant4 10.7 - patch-03 Release Notes
3+
------------------------------------
4+
5+
19 November 2021
6+
7+
List of fixes included in this public patch since the public release 10.7.p02:
8+
9+
o Configuration
10+
-------------
11+
+ CMake:
12+
o Renamed Geant4::HDF5 to hdf5::hdf5 to be compatible with imported
13+
targets provided since CMake 3.20. Addressing problem report #2426.
14+
15+
o Environments:
16+
------------
17+
+ G4py
18+
o Removed binding to obsolete member functions of G4Sphere and G4Tubs.
19+
20+
o Geometry:
21+
--------
22+
+ divisions:
23+
o Make G4PVDivision and G4ReplicatedSlice inherit from G4PVReplica
24+
rather than G4VPhysicalVolume, in order to have instances properly
25+
cloned in MT mode.
26+
o Fixed bug in G4ParameterisationTrd for positioning calculation.
27+
Debug messages cleanup.
28+
+ management:
29+
o Provide operator<<() as a free function for G4UAdapter to support
30+
Geant4Py.
31+
+ navigation:
32+
o G4PhantomParameterisation: reduced warning messages in GetReplicaNo()
33+
function; issue warning only when difference is bigger than
34+
'kCarTolerance'. Addressing problem report #2314.
35+
+ solids/Boolean:
36+
o In G4BooleanSolid, use G4RecursiveMutex in place of G4Mutex in
37+
GetPolyhedron() to avoid potential deadlocks in visualisation
38+
in recursive Boolean operations.
39+
+ solids/specific:
40+
o More accurate calculation of distance from point to triangle
41+
in G4TriangularFacet. Addressing problem report #2401.
42+
o Added missing accessor in G4UTet.
43+
+ volumes:
44+
o Use same strategy for cloning solids for replicated volumes types in
45+
G4GeometryWorkspace (required for having proper treatment of divided
46+
volumes). Cleanup of unused verbose printouts.
47+
o G4PVReplica: moved internal defines for MT split data to source.
48+
Avoid deletion of rotation matrix for replication in Phi in destructor
49+
as not necessary. Some code cleanup.
50+
51+
o Global:
52+
------
53+
+ Updated date and version for 10.7.p03.
54+
55+
o Materials:
56+
---------
57+
+ Corrected calculations in G4DensityEffectCalculator.
58+
Addressing problem report #2330.
59+
+ G4IonisParamMat: return exact computations according to the original
60+
publication. Addressing problem report #2334.
61+
62+
o Parameterisations/gflash
63+
------------------------
64+
+ Fixes in GFlashSamplingShowerParameterisation in the parameters
65+
definition.
66+
67+
o Persistency:
68+
-----------
69+
+ ASCII:
70+
o Change prefix to free math functions in G4tgrEvaluator source, to avoid
71+
potential clashes with system functions carrying same name/signature.
72+
Addressing problem report #2444.
73+
+ GDML
74+
o G4GDMLWriteStructure: added fatal exception in AssemblyWrite() for the
75+
case of nested assemblies, not yet supported for exporting.
76+
o G4GDMLParser: added utility method to retrieve a generic physical
77+
volume by its name.
78+
79+
o Physics Lists:
80+
-------------
81+
+ constructors/gamma_lepto_nuclear
82+
o G4EmExtraPhysics: enable synchrotron radiation only for really stable
83+
particles. Fixed typo in registering positron-nuclear process; register
84+
model for e-/e+-nuclear in case of general processes, avoid registering
85+
synchroton radiation twice for e-/e+.
86+
87+
o Processes - Electromagnetic:
88+
---------------------------
89+
+ standard
90+
o G4BetheBlochModel: fixed computation of dedx for alpha if ICRU90 data
91+
are used. Addressing problem report #2414.
92+
+ utils
93+
o Fix in G4OpticalParametersMessenger for UI command changing incorrect
94+
parameter. Addressing problem report #2392.
95+
+ xrays
96+
o G4Cerenkov: added protection against too small steps (still addressing
97+
problem report #1992).
98+
o G4GaussXTRadiator, G4VXTRenergyLoss: added Gauss-distributed regular
99+
radiator and accessors for angle distribution range.
100+
101+
o Processes - Hadronic:
102+
--------------------
103+
+ cross_sections
104+
o G4NeutronCaptureXS: fixed bug in isotope data access.
105+
+ models/de_excitation
106+
o In G4PhotonEvaporation, changed de-excitation logic from levels, which
107+
has no data on transitions: instead of transition to closest level
108+
continue transition is performed.
109+
Attempting fix for problem report #2434, by reducing production of
110+
fragments with high excitation and high angular momentum.
111+
+ models/particle_hp
112+
o Bug fix in G4ParticleHPLabAngularEnergy.
113+
+ models/util
114+
o G4SampleResonance: bug-fix in the method GetMinimumMass() in the use
115+
case rare and light decay channels (e.g. e+ e-) are included for
116+
hadronic resonances. Addressing problem report #2299.
117+
118+
o Run
119+
---
120+
+ G4VModularPhysicsList: fixed destruction of the vector of
121+
G4VPhysicsConstructor for the case when physics list is created
122+
but physics is not built.
123+
124+
o Tracking
125+
--------
126+
+ G4SteppingManager: Making sure Transportation limits the step if a volume
127+
boundary in a parallel world is co-limiting the step.
128+
Addressing problem report #2240.
129+
130+
o Examples:
131+
--------
132+
+ advanced/ICRP110_HumanPhantoms:
133+
o Updated URL for data download.
134+
+ advanced/STCyclotron:
135+
o Added protection against potential division by zero in function
136+
STCyclotronRun::EndOfRun().
137+
+ extended/hadronic:
138+
o Hadr01: in HistoManager, DetectorConstruction and DetectorMessenger
139+
corrected counting of leaking neutrons.
140+
Addressing problem report #2441.
141+
+ extended/persistency:
142+
o G01: Fixed minor overlaps in assembly.gdml and axes.gdml samples.
143+
o G02, G03: Fixed visualisation settings in input macros.
144+
145+
----------------------------------------------------------------------------
146+
147+
Technical Notes
148+
---------------
149+
150+
o This patch should be applied on top of release 10.7 or 10.7.p01/p02.
151+
o Technical notes distributed for release 10.7 are also applicable and
152+
valid for this patch.
153+
154+
The code and rebuilt binary libraries for release 10.7.p03 are available
155+
through the Geant4 "Download" Web page.
156+
157+
Please refer to the Geant4 User Documentation for further information about
158+
using Geant4.

‎cmake/History

+5
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+
24th September 2021 - Ben Morgan (cmake-V10-06-53)
34+
- Rename Geant4::HDF5 to hdf5::hdf5 to be compatible with
35+
imported target provided since CMake 3.20.
36+
- Backports !2107 to 10.7 to address Bugzilla 2426
37+
3338
19th March 2021 - Gunter Folger (cmake-V10-06-52)
3439
- Update to older G4TENDL 1.3.2, 1.4 has problems.
3540

‎cmake/Modules/G4HDF5Shim.cmake

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# - G4HDF5Shim
1+
# - G4HDF5Shim
22
#
33
# Geant4's Geant4Config.cmake file aims to support CMake 3.8 and newer
44
# The HDF5 dependency is located through CMake's builtin FindHDF5
5-
# module, but this does not supply imported targets as of CMake 3.16.
5+
# module, but this does not supply imported targets until CMake 3.20.
66
# It may use HDF5's hdf5-config.cmake file if available, so create
7-
# custom imported target Geant4::HDF5 to allow both cases to be handled
7+
# custom imported target hdf5::hdf5 to allow both cases to be handled
88
# without interference with either.
99

1010
if(HDF5_FOUND)
@@ -24,18 +24,18 @@ if(HDF5_FOUND)
2424
endif()
2525
endif()
2626

27-
# As FindHDF5 does not yet supply imported targets, we
27+
# If FindHDF5 does not yet supply imported targets, we
2828
# create an internal INTERFACE target to wrap these.
2929
# This still hard-codes include/library paths, but limits it
3030
# to one place. Later, we'll create proper imported targets
3131
# with re-finds but for now this is the best minimally invasive proceedure
32-
if(NOT TARGET Geant4::HDF5)
33-
add_library(Geant4::HDF5 IMPORTED UNKNOWN)
34-
set_target_properties(Geant4::HDF5 PROPERTIES
32+
if(NOT TARGET hdf5::hdf5)
33+
add_library(hdf5::hdf5 IMPORTED UNKNOWN)
34+
set_target_properties(hdf5::hdf5 PROPERTIES
3535
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
3636
IMPORTED_LOCATION "${HDF5_C_LIBRARY_hdf5}"
3737
INTERFACE_INCLUDE_DIRECTORIES "${HDF5_C_INCLUDE_DIRS}"
3838
INTERFACE_LINK_LIBRARIES "${HDF5_C_LIBRARIES}"
3939
)
4040
endif()
41-
endif()
41+
endif()

‎cmake/Modules/G4OptionalComponents.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ if(GEANT4_USE_HDF5)
392392
find_package(HDF5 1.8 REQUIRED)
393393
include("${CMAKE_CURRENT_LIST_DIR}/G4HDF5Shim.cmake")
394394
# Backward compatibility
395-
set(HDF5_LIBRARIES Geant4::HDF5)
395+
set(HDF5_LIBRARIES hdf5::hdf5)
396396

397397
# May have found via config mode...
398398
if(HDF5_DIR)

‎environments/g4py/History

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ Geant4Py is a Geant4-Python bridge.
1111
* Reverse chronological order (last date on top), please *
1212
----------------------------------------------------------
1313

14+
31 Aug. 2021 B.Morgan (geant4py-V10-06-05)
15+
- Remove binding to obsolete member functions of G4Sphere and G4Tubs
16+
- Either no longer used or cause issues when using Vecgeom
17+
1418
16 Nov. 2020 B. Morgan (geant4py-V10-06-04)
1519
- Boost 1.73 modified use of its bind and placeholder functionality, resulting
1620
in Boost.Python spamming pragma messages about deprecation of this.

‎environments/g4py/source/geometry/pyG4Sphere.cc

+1-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ using namespace boost::python;
3838
// ====================================================================
3939
namespace pyG4Sphere {
4040

41-
G4Sphere* CreateSphere(const G4String& name,
41+
G4Sphere* CreateSphere(const G4String& name,
4242
G4double pRmin, G4double pRmax,
4343
G4double pSPhi, G4double pDPhi,
4444
G4double pSTheta, G4double pDTheta)
@@ -61,13 +61,11 @@ void export_G4Sphere()
6161
.def(init<const G4String&, G4double, G4double, G4double,
6262
G4double, G4double, G4double>())
6363
// ---
64-
.def("GetInsideRadius", &G4Sphere::GetInsideRadius)
6564
.def("GetOuterRadius", &G4Sphere::GetOuterRadius)
6665
.def("GetStartPhiAngle", &G4Sphere::GetStartPhiAngle)
6766
.def("GetDeltaPhiAngle", &G4Sphere::GetDeltaPhiAngle)
6867
.def("GetStartThetaAngle", &G4Sphere::GetStartThetaAngle)
6968
.def("GetDeltaThetaAngle", &G4Sphere::GetDeltaThetaAngle)
70-
.def("SetInsideRadius", &G4Sphere::SetInsideRadius)
7169
.def("SetOuterRadius", &G4Sphere::SetOuterRadius)
7270
.def("SetStartPhiAngle", &G4Sphere::SetStartPhiAngle)
7371
.def("SetDeltaPhiAngle", &G4Sphere::SetDeltaPhiAngle)

‎environments/g4py/source/geometry/pyG4Tubs.cc

-5
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,6 @@ void export_G4Tubs()
6969
.def("SetZHalfLength", &G4Tubs::SetZHalfLength)
7070
.def("SetStartPhiAngle", &G4Tubs::SetStartPhiAngle)
7171
.def("SetDeltaPhiAngle", &G4Tubs::SetDeltaPhiAngle)
72-
.def("GetRMin", &G4Tubs::GetRMin)
73-
.def("GetRMax", &G4Tubs::GetRMax)
74-
.def("GetDz", &G4Tubs::GetDz)
75-
.def("GetSPhi", &G4Tubs::GetSPhi)
76-
.def("GetDPhi", &G4Tubs::GetDPhi)
7772
// operators
7873
.def(self_ns::str(self))
7974
;

0 commit comments

Comments
 (0)