Skip to content

Commit 96205ca

Browse files
gcosmogcosmo
committed
Import Geant4 10.3.2 source tree
1 parent 31a2416 commit 96205ca

File tree

869 files changed

+15594
-109511
lines changed

Some content is hidden

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

869 files changed

+15594
-109511
lines changed

‎CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# 21st September 2010 Ben Morgan
55
#
6-
# $Id: CMakeLists.txt 102581 2017-02-09 09:30:38Z gcosmo $
6+
# $Id: CMakeLists.txt 105145 2017-07-14 07:51:44Z gcosmo $
77
#
88

99
#-----------------------------------------------------------------------
@@ -35,10 +35,10 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX
3535
project(Geant4)
3636

3737
# - Versioning. We do this here for now
38-
set(${PROJECT_NAME}_VERSION "10.3.1")
38+
set(${PROJECT_NAME}_VERSION "10.3.2")
3939
set(${PROJECT_NAME}_VERSION_MAJOR "10")
4040
set(${PROJECT_NAME}_VERSION_MINOR "3")
41-
set(${PROJECT_NAME}_VERSION_PATCH "1")
41+
set(${PROJECT_NAME}_VERSION_PATCH "2")
4242

4343

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

‎ReleaseNotes/Patch4.10.3-2.txt

+219
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
1+
2+
Geant4 10.3 - patch-02 Release Notes
3+
------------------------------------
4+
5+
27 July 2017
6+
7+
List of fixes included in this public patch since the public release 10.3.p01:
8+
9+
o Configuration:
10+
-------------
11+
+ CMake:
12+
o Added VECGEOM_DEFINITIONS and VECGEOM_EXTERNAL_INCLUDES when compiling
13+
with USolids/VecGeom enabled, to allow for detection of external
14+
packages paths from VecGeom.
15+
o Corrected Qt setup for GNUmake builds, avoid setting QTLIBS and
16+
GLQTLIBS as already handled by the GNUmake system for Qt4 and Qt5.
17+
+ GNUmake:
18+
o Corrected order of linkage in binmake.gmk for analysis global library.
19+
20+
o Analysis:
21+
--------
22+
+ Fixed problem of removing non-empty ntuple files in user application
23+
where ntuples are created after open file.
24+
+ Added GetP[1,2]Id(const G4String&) functions to G4AnaysisManager.
25+
Addressing problem report #1949.
26+
+ Corrected handling of open file failure.
27+
Addressing problem report #1957.
28+
29+
o Event:
30+
-----
31+
+ Fixed 'fallthrough' compilation warnings in case statements on gcc-7.1.
32+
33+
o Externals:
34+
---------
35+
+ Fixed compilation warnings on gcc-7.1.
36+
37+
o G3toG4:
38+
------
39+
+ Fixed compilation warnings on gcc-7.1.
40+
41+
o Generic Processes:
42+
-----------------
43+
+ biasing:
44+
o G4GeometrySampler: removed unnecessary ClearSampling() from the
45+
destructor.
46+
+ scoring:
47+
o G4ParallelWorldProcess: fix to have a valid pointer to secondaries
48+
in G4Step of a parallel world.
49+
50+
o Geometry:
51+
--------
52+
+ biasing:
53+
o Added mutex locks to methods within G4IStore and G4ImportanceAlgorithm.
54+
Temporary fix for erratic behaviour in MT-mode and crashing if bounds-
55+
checking is switched on with many threads/events.
56+
Addressing problem report #1945.
57+
+ solids/CSG:
58+
o Fixed possible rounding off error in calculation of 'astep' (max angle
59+
for one step) in CalculateExtent() for G4Cons, G4Tubs, G4CutTubs
60+
and related USolids wrappers.
61+
o Added accessor to G4Orb and G4UOrb for retrieving cached max radius
62+
tolerance.
63+
o Fix in G4CutTubs::Inside() for case where inside points were considered
64+
as points on surface. Addressing problem report #1973.
65+
+ solids/specific:
66+
o Fixed possible rounding off error in calculation of 'astep' (max angle
67+
for one step) in CalculateExtent() for G4Polycone, G4GenericPolycone
68+
and related USolids wrappers.
69+
o Removed potential race condition in G4VTwistSurface::AmIOnLeftSide().
70+
Addressing problem report #1972.
71+
72+
o Global:
73+
------
74+
+ Corrected TLS setup in tls.hh for gcc compiler.
75+
+ Updated date and version for 10.3.p02.
76+
77+
o Intercoms:
78+
---------
79+
+ Fix to G4GenericMessenger::Command::SetUnit: do not ignore setting and
80+
issue a warning when running sequential application built against Geant4
81+
libraries compiled with MT enabled.
82+
83+
o Physics Lists
84+
-------------
85+
+ constructors/electromagnetic:
86+
o G4EmStandardPhysicsSS: apply single scattering to all particles.
87+
Addressing problem report #1966.
88+
o G4EmModelActivator: fixed Opt4 and SS per region.
89+
+ lists:
90+
o G4PhysListFactory: fixed EM option "__SS".
91+
Addressing problem report #1966.
92+
93+
o Processes - Electromagnetic:
94+
---------------------------
95+
+ dna:
96+
o Fixed compilation warnings on gcc-7.1.
97+
+ lowenergy:
98+
o G4LowEPPolarizedComptonModel: fixed FPE in comptation of std::acos().
99+
o Fixed compilation warnings on gcc-7.1.
100+
+ standard:
101+
o G4UniversalFluctuation: fixed numerical problem for sampling
102+
low-energy anti-protons with very small steps.
103+
o G4NuclearStopping, G4ICRU49NuclearStoppingModel: fixed nuclear
104+
stopping power computation addressed in Hypernews post #1595 in the
105+
Hadronic Processes Forum.
106+
o G4hIonisation: fixed min/max energy for dEdx table for the case when
107+
the mass of a hadron is very different from the mass of proton.
108+
+ utils:
109+
o G4EmCalculator: for computation of the nuclear stopping power, use
110+
concrete model (applied at run time) instead of G4EmCorrections
111+
emulation; to get cross section per volume for discrete processes
112+
use interface of the process. Addressing Hypernwes post #1595 in the
113+
Hadronic Processes Forum.
114+
o G4VEmModel: added extra protected class member for nuclear stopping.
115+
o G4EmSaturation: fixed typo in printout.
116+
117+
o Processes - Hadronic:
118+
--------------------
119+
+ models/cascade:
120+
o G4CascadeCoalescence: removed clusterHash() function and 'triedClusters'
121+
registry. Droped redundant calls of tryCluster() with subcombinatorics;
122+
all combinations are handled, uniquely, in main loop over indices.
123+
This eliminates significant memory usage observed with high-energy
124+
applications of BERT.
125+
+ models/de_excitation:
126+
o G4DeexPrecoParameters: disabled parameter change in G4_Idle state,
127+
only G4_PreInit is allowed; disabled correlated gamma;
128+
set default time limit to 1000s (if radioactive decay is enabled this
129+
time may be set to the limit of the G4NuclideTable), this allows do
130+
not create extra isomeres if radioactive decay is not included in the
131+
physics list
132+
o G4LevelReader, G4LevelManager, G4PhotonEvaporation: for stable states
133+
(ground state isotopes) set life time to "-1"; changed all checks
134+
accordingly.
135+
o G4LevelReader: issue fatal exception if data file is not open.
136+
Addressing problem report #1942.
137+
o G4PhotonEvaporation: always have gamma transition to the discrete
138+
level (if there is no levels, go to the ground state).
139+
Addressing problem report #1950.
140+
+ models/lend:
141+
o Fixed compilation warnings on gcc-7.1.
142+
o Fixed Coverity defects.
143+
+ models/particle_hp:
144+
o Added check for He3 projectile. Addressing problem report #1907.
145+
o G4ParticleHPThermalScattering: fixed angular distribution sampling
146+
problem. Addressing problem report #1971.
147+
o Fix in destructor of processes to protect against concurrent deletion.
148+
o Bug fix and improved stability in G4ParticleHPFinalState.
149+
o Suppressed unnecessary warning messages in G4ParticleHPEnAngCorrelation.
150+
o Fixed minor inconsistency between documentation and code.
151+
+ models/radioactive_decay:
152+
o G4RadioactiveDecay::DecayIt(): added statement to propagate weight of
153+
parent track. Addressing problem report #1946.
154+
+ models/util:
155+
o G4Fragment: fixed destructor and printout.
156+
o G4PolynomialPDF: fix for potential division by zero.
157+
+ util:
158+
o G4GHEKinematicsVector: fixed case of variable shadowing.
159+
160+
o Run:
161+
---
162+
+ G4RunManagerKernel: removed unnecessary warning message.
163+
164+
o Visualization:
165+
-------------
166+
+ Fixed compilation warnings on gcc-7.1.
167+
168+
o Examples:
169+
--------
170+
+ Updated reference outputs.
171+
+ Fixed compilation warning on gcc-7.1.
172+
+ advanced/air_shower:
173+
o Updated setup for visualization in main() and Visualisation.mac.
174+
+ extended/biasing/B01:
175+
+ extended/biasing/B02:
176+
o Removed unnecessary clearing of sampling.
177+
+ extended/biasing/B03:
178+
o B03PhysicsList: removed obsolete unnecessary instantiation of
179+
de-excitation sub-models.
180+
o Removed unnecessary clearing of sampling.
181+
+ extended/eventgenerator/HepMC/MCTruth:
182+
o Fixed typo in initialisation.
183+
+ extended/g3tog4:
184+
o Fixed linking problem for static build.
185+
+ extended/optical/LXe:
186+
o Fix for issue reported on Hypernews Optical-Photons Forum #651.
187+
+ extended/medical/DICOM:
188+
o Fix to DicomRun::RecordEvent() that was incrementing the inherited
189+
numberOfEvent variable from G4Run twice causing the output of the
190+
number of events to be twice the actual value.
191+
o Corrected element definitions for Potassium and Phosphorus in
192+
DetectorConstruction.
193+
+ extended/persistency/gdml/G01:
194+
o Updated setup for visualization in main program.
195+
o Added missing gdml files to CMake installation script.
196+
+ extended/persistency/gdml/G02:
197+
+ extended/persistency/gdml/G03:
198+
o Updated setup for visualization in main program.
199+
+ extended/radioactivedecay/rdecay02:
200+
o Updated README, adding a note stating that all histograms but one are
201+
turned off by default, and describing how to turn them back on.
202+
Addressing problem report #1936.
203+
+ extended/runAndEvent/RE05:
204+
o Fixed potential rare race condition issue in RE05PrimaryGeneratorAction.
205+
206+
----------------------------------------------------------------------------
207+
208+
Technical Notes
209+
---------------
210+
211+
o This patch should be applied on top of release 10.3.p01.
212+
o Technical notes distributed for release 10.3 are also applicable and
213+
valid for this patch.
214+
215+
The code and rebuilt binary libraries for release 10.3.p02 are available
216+
through our "Download" Web page.
217+
218+
Please refer to the Geant4 User Documentation for further information about
219+
using Geant4.

‎cmake/History

+20
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,26 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
3131

3232
----------------------------------------------------------
3333

34+
17th July 2017 - Gabriele Cosmo (cmake-V10-02-41)
35+
- Modules/Geant4ToolchainBackwardCompatibility.cmake,
36+
Modules/Geant4InterfaceOptions.cmake:
37+
corrected Qt setup for GNUmake builds, avoid setting QTLIBS and GLQTLIBS
38+
as already handled by the GNUmake system for Qt4 and Qt5.
39+
40+
9th June 2017 - Gabriele Cosmo (cmake-V10-02-40)
41+
- Corrected exporting of external packages paths from VecGeom.
42+
43+
30th May 2017 - Gabriele Cosmo
44+
- Modules/Geant4OptionalComponents.cmake: added VECGEOM_EXTERNAL_INCLUDES
45+
to include directories for USolids/VecGeom enabled build, in order to
46+
allow for detection of external packages paths from VecGeom (e.g. Vc if
47+
Vetor backend is chosen at installation of VecGeom).
48+
49+
24th May 2017 - Gabriele Cosmo
50+
- Modules/Geant4OptionalComponents.cmake: appended VECGEOM_DEFINITIONS
51+
to GEANT4_USOLIDS_COMPILE_DEFINITIONS. Preparing for introducing direct
52+
dependency on VecGeom in G4U* wrappers, and deprecate USolids.
53+
3454
21st February 2017 - Gunter Folger (cmake-V10-02-39)
3555
- Switch to PhotonEvaporation 4.3.2
3656

‎cmake/Modules/Geant4BuildProjectConfig.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ if(GEANT4_USE_USOLIDS OR GEANT4_USE_PARTIAL_USOLIDS)
7979
# System USolids headers, because these do appear in Geant4's
8080
# public interface. The library should be in the link interface
8181
# of G4geometry (may need refinding)
82-
list(APPEND GEANT4_THIRD_PARTY_INCLUDES ${USOLIDS_INCLUDE_DIRS})
82+
list(APPEND GEANT4_THIRD_PARTY_INCLUDES ${USOLIDS_INCLUDE_DIRS} ${VECGEOM_EXTERNAL_INCLUDES})
8383
endif()
8484

8585
# - Stuff from Geant4InterfaceOptions.cmake

‎cmake/Modules/Geant4ConfigureConfigScript.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ if(NOT GEANT4_BUILD_GRANULAR_LIBS AND UNIX)
153153
# - USolids
154154
if(GEANT4_USE_USOLIDS OR GEANT4_USE_PARTIAL_USOLIDS)
155155
set(G4_BUILTWITH_USOLIDS "yes")
156-
set(G4_USOLIDS_INCLUDE_DIRS ${USOLIDS_INCLUDE_DIRS})
156+
set(G4_USOLIDS_INCLUDE_DIRS "${USOLIDS_INCLUDE_DIRS} ${VECGEOM_EXTERNAL_INCLUDES}")
157157
list(REMOVE_DUPLICATES G4_USOLIDS_INCLUDE_DIRS)
158158
list(REMOVE_ITEM G4_USOLIDS_INCLUDE_DIRS ${_cxx_compiler_dirs})
159159

‎cmake/Modules/Geant4InterfaceOptions.cmake

-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ if(GEANT4_USE_QT)
106106
set(QT_USE_FILE "${PROJECT_BINARY_DIR}/Geant4UseQt5.cmake")
107107
configure_file("${Qt5_USE_FILE_IN}" "${QT_USE_FILE}" @ONLY)
108108
get_target_property(QT_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} IMPORTED_LOCATION)
109-
set(G4QTLIBLIST "-lQt5PrintSupport -lQt5Widgets -lQt5Gui -lQt5Core")
110-
set(G4GLQTLIBLIST "-lQt5OpenGL ${G4QTLIBLIST}")
111109
else()
112110
unset(Qt5Core_DIR CACHE)
113111
unset(Qt5Gui_DIR CACHE)

‎cmake/Modules/Geant4OptionalComponents.cmake

+2-1
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,14 @@ if(GEANT4_USE_ALL_USOLIDS OR GEANT4_USE_PARTIAL_USOLIDS)
241241
endforeach()
242242
GEANT4_ADD_FEATURE(GEANT4_USE_USOLIDS "Replacing Geant4 solids with USolids equivalents for ${GEANT4_USE_PARTIAL_USOLIDS_SHAPE_LIST} (EXPERIMENTAL)")
243243
endif()
244+
list (APPEND GEANT4_USOLIDS_COMPILE_DEFINITIONS ${VECGEOM_DEFINITIONS})
244245

245246
# Combined definitions
246247
add_definitions(${GEANT4_USOLIDS_COMPILE_DEFINITIONS})
247248

248249
# Add USolids inc dirs here - can be removed once USolids supports
249250
# INTERFACE_INCLUDE_DIRECTORIES
250-
include_directories(${USOLIDS_INCLUDE_DIRS})
251+
include_directories(${USOLIDS_INCLUDE_DIRS} ${VECGEOM_EXTERNAL_INCLUDES})
251252
endif()
252253

253254

‎cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake

-8
Original file line numberDiff line numberDiff line change
@@ -481,14 +481,6 @@ macro(_g4tc_configure_tc_variables SHELL_FAMILY SCRIPT_NAME)
481481
if(GEANT4_USE_QT)
482482
_g4tc_setenv_command(GEANT4_TC_QTHOME ${SHELL_FAMILY} QTHOME ${G4QTHOME})
483483
_g4tc_setenv_command(GEANT4_TC_QTLIBPATH ${SHELL_FAMILY} QTLIBPATH ${G4QTLIBPATH})
484-
if(QT4_FOUND)
485-
set(GEANT4_TC_QTLIBS "#Geant4Make automatically handles QTLIBS for Qt4")
486-
set(GEANT4_TC_GLQTLIBS "#Geant4Make automatically handles GLQTLIBS for Qt4")
487-
else()
488-
_g4tc_setenv_command(GEANT4_TC_QTLIBS ${SHELL_FAMILY} QTLIBS "\"-L${G4QTLIBPATH} ${G4QTLIBLIST}\"")
489-
_g4tc_setenv_command(GEANT4_TC_GLQTLIBS ${SHELL_FAMILY} GLQTLIBS "\"-L${G4QTLIBPATH} ${G4GLQTLIBLIST}\"")
490-
endif()
491-
492484
_g4tc_setenv_command(GEANT4_TC_G4UI_USE_QT ${SHELL_FAMILY} G4UI_USE_QT 1)
493485
_g4tc_setenv_command(GEANT4_TC_G4VIS_USE_OPENGLQT ${SHELL_FAMILY} G4VIS_USE_OPENGLQT 1)
494486

‎config/History

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
svn log $Id: History 101512 2016-11-18 15:28:47Z gcosmo $
1+
svn log $Id: History 105125 2017-07-13 14:06:47Z gcosmo $
22
-------------------------------------------------------------------
33

44
=========================================================
@@ -16,11 +16,14 @@ committal in the CVS repository !
1616
* Reverse chronological order (last date on top), please *
1717
----------------------------------------------------------
1818

19-
18th November 2016 Gunter Folger (config-V10-02-07)
19+
14th March 2017 Gabriele Cosmo (config-V10-02-08)
20+
- Corrected order of linkage in binmake.gmk for analysis global library.
21+
22+
18th November 2016 Gunter Folger (config-V10-02-07)
2023
- add include for analysis/accumulables
2124
- revert change forcing load of libraries
2225

23-
9th November 2016 Gunter Folger (config-V10-02-06) *tag REJECTED*
26+
9th November 2016 Gunter Folger (config-V10-02-06) *tag REJECTED*
2427
- Force loading of symbols for physics_lists/constructor and builders
2528
libraries in granular mode for static libs
2629

‎config/binmake.gmk

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: binmake.gmk 101512 2016-11-18 15:28:47Z gcosmo $
1+
# $Id: binmake.gmk 105125 2017-07-13 14:06:47Z gcosmo $
22
# ----------------------------------------------------------
33
# Script defining rules and paths for making binaries.
44
# First implementation: Gabriele Cosmo, 25/06/1998.
@@ -233,8 +233,7 @@ ifdef GLOBALLIBS
233233
LDLIBS2 += -lG3toG4
234234
endif
235235

236-
LDLIBS2 += -lG4analysis \
237-
-lG4error_propagation \
236+
LDLIBS2 += -lG4error_propagation \
238237
-lG4readout \
239238
-lG4physicslists \
240239
-lG4run \
@@ -248,6 +247,7 @@ ifdef GLOBALLIBS
248247
-lG4geometry \
249248
-lG4materials \
250249
-lG4graphics_reps \
250+
-lG4analysis \
251251
-lG4intercoms \
252252
-lG4global
253253

‎environments/g4py/site-modules/physics_lists/ExN03pl/CMakeLists.txt

-23
This file was deleted.

0 commit comments

Comments
 (0)