Skip to content

Commit edb408b

Browse files
committed
Import Geant4 9.6.4 source tree
1 parent 9b21371 commit edb408b

File tree

109 files changed

+792
-253
lines changed

Some content is hidden

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

109 files changed

+792
-253
lines changed

CMakeLists.txt

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# 21st September 2010 Ben Morgan
55
#
66
# $Id: CMakeLists.txt,v 1.6 2010-12-08 16:36:34 bmorgan Exp $
7-
# GEANT4 Tag $Name: not supported by cvs2svn $
87
#
98

109
#------------------------------------------------------------------------------
@@ -24,6 +23,30 @@ endif()
2423
# - Define CMake requirements and override make rules as needed
2524
#
2625
cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)
26+
27+
# If Policy CMP0022 exists, use OLD because Geant4 still needs
28+
# to support versions < 2.8.12.
29+
# This relates to LINK_INTERFACE_LIBRARIES and can be removed once
30+
# minimum required CMake version reaches 2.8.12
31+
if(POLICY CMP0022)
32+
cmake_policy(SET CMP0022 OLD)
33+
endif()
34+
35+
# If Policy CMP0042 exists, use OLD to prefer the use of install names
36+
# instead of the new @rpath default. This is temporary to suppress warnings
37+
# on newer CMake versions.
38+
if(POLICY CMP0042)
39+
cmake_policy(SET CMP0042 OLD)
40+
endif()
41+
42+
# If Policy CMP0043 exists, use OLD because Geant4 still needs
43+
# to support Geant4 =< 2.8.12.
44+
# This relates to the use of generator expressions to set COMPILE_DEFINITIONS
45+
# and can be removed once the minimum required CMake version reaches 2.8.10.
46+
if(POLICY CMP0043)
47+
cmake_policy(SET CMP0043 OLD)
48+
endif()
49+
2750
set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX
2851
${CMAKE_SOURCE_DIR}/cmake/Modules/Geant4MakeRules_cxx.cmake)
2952

@@ -52,10 +75,10 @@ set(CMAKE_MODULE_PATH
5275
# See the documentation in each of these modules for further details.
5376
#
5477
# - Versioning. We do this here for now
55-
set(${PROJECT_NAME}_VERSION "9.6.3")
78+
set(${PROJECT_NAME}_VERSION "9.6.4")
5679
set(${PROJECT_NAME}_VERSION_MAJOR "9")
5780
set(${PROJECT_NAME}_VERSION_MINOR "6")
58-
set(${PROJECT_NAME}_VERSION_PATCH "3")
81+
set(${PROJECT_NAME}_VERSION_PATCH "4")
5982

6083
# - Provide dependent options as these are needed for some Geant4 features
6184
include(CMakeDependentOption)

ReleaseNotes/Patch4.9.6-3.txt

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

55
14 March 2014
66

7-
List of fixes included in this public patch since the public release 9.6.p01:
7+
List of fixes included in this public patch since the public release 9.6.p02:
88

99
o Configuration:
1010
-------------
@@ -35,7 +35,7 @@ List of fixes included in this public patch since the public release 9.6.p01:
3535
o Fix to G4VSolid::EstimateCubicVolume() to make proper use of specified
3636
accuracy. Addressing problem report #1493.
3737
+ navigation:
38-
o G4MultiNavigator: fixed use of enum as Boolean in GetGlobalExitNormal(). (+)
38+
o G4MultiNavigator: fixed use of enum as Boolean in GetGlobalExitNormal().
3939
+ solids/CSG:
4040
o Corrected sanity check for wrong/small dimensions in G4Box constructor.
4141
o Correctly initialise fSPhi to zero in G4Sphere constructor.
@@ -78,7 +78,7 @@ List of fixes included in this public patch since the public release 9.6.p01:
7878
o Generic Processes:
7979
-----------------
8080
+ Decay:
81-
o Fixed problem of wrong global time for secondaries in case that the (+)
81+
o Fixed problem of wrong global time for secondaries in case that the
8282
primary track stops during along step. Addressing problem report #1555.
8383

8484
o Hadronic Processes:

ReleaseNotes/Patch4.9.6-4.txt

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
2+
Geant4 9.6 - patch-04 Release Notes
3+
-----------------------------------
4+
5+
30 January 2015
6+
7+
List of fixes included in this public patch since the public release 9.6.p03:
8+
9+
o Geometry:
10+
--------
11+
+ navigation:
12+
o G4Navigator: corrected saving/restoring of 'navigator state'.
13+
o G4PathFinder: added EndTrack() method, to reset internal state
14+
and inform G4TransportationManager to use 'ordinary' Navigator.
15+
o Fix in G4MultiNavigator to properly set 'fIdNavLimiting' index to
16+
navigator limiting the step, if only one navigator limits the step.
17+
+ solids/specific:
18+
o Fixed triangularisation method AddGeneralPOlygoneFacets() in
19+
G4ExtrudedSolid by avoiding flat triangles. Added warning message to
20+
G4TriangularFacet constructor if Area is 0; i.e., case of flat triangle.
21+
Addressing problem report #1703.
22+
o Get rid of deprecated 'register' storage class specifier in source files.
23+
+ volumes
24+
o Avoid post-increment in G4NavigationLevelRep::AddAReference().
25+
26+
o Global:
27+
------
28+
+ Fix in G4SimplexDownhill header to proper define header guard.
29+
+ Updated date and version for 9.6.p04.
30+
31+
o Generic Processes:
32+
-----------------
33+
+ Management:
34+
o Fixed logic in G4ProcessManager::SetProcessOrderingToSecond() to make
35+
sure the process is always set before the process that has ordering
36+
index 1.
37+
+ Transportation:
38+
o Fix in G4CoupledTransportation to message G4PathFinder for resetting
39+
to the default navigator as the 'standard' Mass navigator at end of
40+
tracking. Avoid use of multi-navigator when it should not be used.
41+
o Fix in G4Transportation to save pointer to particle change as required
42+
by G4VProcess interface.
43+
44+
o Hadronic Processes:
45+
------------------
46+
+ management:
47+
o G4HadronicProcess::CheckResult(): added check for dynamic mass
48+
to correspond to PDG mass within ~10%.
49+
+ models/binary_cascade:
50+
o G4BinaryCasacde: improved calculation of mass, and of correction for
51+
outgoing particles by always using GetIon() method; addresses potential
52+
crash for p+d seen in d+H in BIC.
53+
o G4{Proton,Neutron}Field: protect against negative index into buffer.
54+
+ models/cascade:
55+
o G4CascadeInterface: fixed possible infinite-loop condition where
56+
(nTries >= maxTries) and momentum balance fails.
57+
o G4InuclNuclei: fix case of floating-point exception in
58+
setExcitationEnergy() for zero Ekin.
59+
o Fix for memory leak in secondaries in G4IntraNucleiCascader.
60+
Addressing problem report #1584.
61+
+ models/parton_string:
62+
o Fix for rare crash in G4LundStringFragmentation in the case of
63+
anti-sigma+ capture at rest on hydrogen.
64+
+ stopping:
65+
o G4MuMinusCapturePrecompound: added simplified model for capture in
66+
deuterium and in He4; reduced number of trials to find neutrino
67+
4-momentum from 1000 to 100; added protection 1 keV for negative
68+
excitation energy, and substituted FatalException by JustWarning.
69+
Addressing rare cases of infinite loop reported by ATLAS.
70+
o G4AntiProtonAnnihilationAtRest: fixed bug related to a wrong target
71+
sampling (always the last element of the element vector was sampled
72+
as target).
73+
o G4HadronStoppingProcess, G4MuonMinusBoundDecay: fixed time of muon
74+
nuclear capture secondaries. Addressing problem report #1695.
75+
o Fix for Coverity defects in G4MuonMinusCaptureAtRest.
76+
77+
o Intercoms:
78+
---------
79+
+ G4GenericMessenger: fixed case of core dump when GetCurrentValue()
80+
method is invoked for a command defined by DeclareMethod().
81+
+ Corrected inclusion protection flag in G4GenericMessenger.hh.
82+
Addressing old problem report #1527.
83+
+ Fixed treatment of double-quotes in G4UImanager::ForeachS().
84+
Addressing problem report #1614.
85+
86+
o Interfaces:
87+
----------
88+
+ Explicitly set the LC_NUMERIC locale to "C" in G4Qt.
89+
Addressing problem report #1487.
90+
Fixed problem with resizing the QGLwidget when scene is opened from UI.
91+
92+
o Persistency:
93+
-----------
94+
+ ascii:
95+
o Corrected dump of 'phi' and 'theta' for G4Trap and G4Para in dumper.
96+
Addressing problem report #1602.
97+
+ gdml:
98+
o Fixed typo in G4GDMLWriteSolids::BooleanWrite() for the case of repeated
99+
displacements of the reference solid in the same Boolean operation (issue
100+
reported by ATLAS).
101+
o Correction to G4GDMLReadMaterials::MixtureRead() to revert order of
102+
reading (first elements then materials) for mixtures by fraction;
103+
corrects referencing for cases when elements and materials may carry
104+
the same name (case reported by ATLAS).
105+
o Correction to G4GDMLRead::Read() for the case when schema validation
106+
is turned off, to disable initialisation of validation machinery in the
107+
parser and allow for standalone parsing off-network.
108+
Added better description to fatal exception in case document content
109+
imported happens to be empty in G4GDMLRead::Read().
110+
o Corrected minor Coverity defect in G4GDMLParser for uninitialised
111+
'strip' flag in constructors.
112+
o Corrected potential memory leak in G4GDMLReadSolids.
113+
o Corrected dump of 'phi' and 'theta' for G4Trap and G4Para in writer.
114+
Addressing problem report #1602.
115+
o Get rid of deprecated 'register' storage class specifier in source files.
116+
o Added comparison operator for 3-vector key in 'vertexMap' in
117+
G4GDMLWriteSolids for export of tessellated solid.
118+
Addressing problem report #1573.
119+
120+
o Examples:
121+
--------
122+
+ Updated reference outputs.
123+
124+
----------------------------------------------------------------------------
125+
126+
Technical Notes
127+
---------------
128+
129+
o This patch should be applied on top of release 9.6.
130+
o Technical notes distributed for release 9.6 are also applicable and
131+
valid for this patch.
132+
133+
The code and rebuilt binary libraries for release 9.6.p04 are available
134+
through our "Download" Web page:
135+
http://cern.ch/geant4/support/download.shtml
136+
137+
Please refer to the Geant4 User Documentation:
138+
http://cern.ch/geant4/support/userdocuments.shtml
139+
for further information about using Geant4.

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-09-06-patch-03 (14-March-2014)
7+
Geant4 version Name: geant4-09-06-patch-04 (30-January-2015)
88
Copyright : Geant4 Collaboration
99
Reference : NIM A 506 (2003), 250-303
1010
WWW : http://cern.ch/geant4
@@ -182,7 +182,7 @@ Start Run processing.
182182
Run terminated.
183183
Run Summary
184184
Number of events processed : 10000
185-
User=18.03s Real=59.52s Sys=0.27s
185+
User=17.7s Real=45.23s Sys=0.56s
186186

187187
-------------------------------------------------------------
188188
---> The calorimeter is 9 Modules

examples/advanced/gammaray_telescope/gammaraytel.out

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

66
*************************************************************
7-
Geant4 version Name: geant4-09-06-patch-03 (14-March-2014)
7+
Geant4 version Name: geant4-09-06-patch-04 (30-January-2015)
88
Copyright : Geant4 Collaboration
99
Reference : NIM A 506 (2003), 250-303
1010
WWW : http://cern.ch/geant4
@@ -2073,7 +2073,7 @@ Number of digits in this event = 5
20732073
Run terminated.
20742074
Run Summary
20752075
Number of events processed : 100
2076-
User=0.47s Real=0.8s Sys=0s
2076+
User=0.47s Real=1.03s Sys=0.02s
20772077
End of Run
20782078
File Tracks_0.dat
20792079
/gun/particle gamma
@@ -3274,7 +3274,7 @@ Number of digits in this event = 1
32743274
Run terminated.
32753275
Run Summary
32763276
Number of events processed : 100
3277-
User=2.78s Real=5.4s Sys=0.01s
3277+
User=2.78s Real=8.12s Sys=0s
32783278
End of Run
32793279
File Tracks_1.dat
32803280
/gun/particle e-
@@ -5709,7 +5709,7 @@ Number of digits in this event = 12
57095709
Run terminated.
57105710
Run Summary
57115711
Number of events processed : 100
5712-
User=2.92s Real=6.83s Sys=0s
5712+
User=2.9s Real=8.42s Sys=0s
57135713
End of Run
57145714
File Tracks_2.dat
57155715
Graphics systems deleted.

examples/basic/B1/exampleB1.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
############################################
55

66
*************************************************************
7-
Geant4 version Name: geant4-09-06-patch-03 (14-March-2014)
7+
Geant4 version Name: geant4-09-06-patch-04 (30-January-2015)
88
Copyright : Geant4 Collaboration
99
Reference : NIM A 506 (2003), 250-303
1010
WWW : http://cern.ch/geant4

examples/basic/B2/B2a/exampleB2a.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
############################################
55

66
*************************************************************
7-
Geant4 version Name: geant4-09-06-patch-03 (14-March-2014)
7+
Geant4 version Name: geant4-09-06-patch-04 (30-January-2015)
88
Copyright : Geant4 Collaboration
99
Reference : NIM A 506 (2003), 250-303
1010
WWW : http://cern.ch/geant4

examples/basic/B2/B2b/exampleB2b.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-09-06-patch-03 (14-March-2014)
7+
Geant4 version Name: geant4-09-06-patch-04 (30-January-2015)
88
Copyright : Geant4 Collaboration
99
Reference : NIM A 506 (2003), 250-303
1010
WWW : http://cern.ch/geant4
@@ -13994,7 +13994,7 @@ Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolu
1399413994
* G4Track Information: Particle = e-, Track ID = 1098, Parent ID = 1095
1399513995
*********************************************************************************************************
1399613996

13997-
Step#
13997+
Step#
1399813998
============================================================================================
1399913999
================= lines above cut to keep file within limits ===============================
1400014000
============================================================================================

examples/basic/B3/exampleB3.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
############################################
55

66
*************************************************************
7-
Geant4 version Name: geant4-09-06-patch-03 (14-March-2014)
7+
Geant4 version Name: geant4-09-06-patch-04 (30-January-2015)
88
Copyright : Geant4 Collaboration
99
Reference : NIM A 506 (2003), 250-303
1010
WWW : http://cern.ch/geant4

examples/basic/B4/B4a/exampleB4a.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
############################################
55

66
*************************************************************
7-
Geant4 version Name: geant4-09-06-patch-03 (14-March-2014)
7+
Geant4 version Name: geant4-09-06-patch-04 (30-January-2015)
88
Copyright : Geant4 Collaboration
99
Reference : NIM A 506 (2003), 250-303
1010
WWW : http://cern.ch/geant4

0 commit comments

Comments
 (0)