Skip to content

Commit beb8e5d

Browse files
committed
Import Geant4 9.6.2 source tree
1 parent 9715699 commit beb8e5d

File tree

242 files changed

+30946
-28043
lines changed

Some content is hidden

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

242 files changed

+30946
-28043
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ set(CMAKE_MODULE_PATH
5252
# See the documentation in each of these modules for further details.
5353
#
5454
# - Versioning. We do this here for now
55-
set(${PROJECT_NAME}_VERSION "9.6.1")
55+
set(${PROJECT_NAME}_VERSION "9.6.2")
5656
set(${PROJECT_NAME}_VERSION_MAJOR "9")
5757
set(${PROJECT_NAME}_VERSION_MINOR "6")
58-
set(${PROJECT_NAME}_VERSION_PATCH "1")
58+
set(${PROJECT_NAME}_VERSION_PATCH "2")
5959

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

ReleaseNotes/Patch4.9.6-2.txt

Lines changed: 216 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,216 @@
1+
2+
Geant4 9.6 - patch-02 Release Notes
3+
-----------------------------------
4+
5+
17 May 2013
6+
7+
List of fixes included in this public patch since the public release 9.6.p01:
8+
9+
o Error Propagation:
10+
-----------------
11+
+ Introduced fixes for problem reports #1435, #1447, #1448 and #1453.
12+
+ Fixed memory leak in G4ErrorPropagator::PropagateOneStep() for track
13+
creation at the first step. Addresses problem report #1466.
14+
Corrected composed printout. Removed unused data.
15+
16+
o Event:
17+
-----
18+
+ Ensure deletion of "angsigmayCmd1" G4UIcommand instance in destructor
19+
of G4GeneralParticleSourceMessenger, fixing minor memory leak.
20+
+ Removed unused variables in G4AdjointPosOnPhysVolGenerator,
21+
G4AdjointPosOnPhysVolGenerator, G4GeneralParticleSource,
22+
G4SPSEneDistribution, and G4SPSRandomGenerator.
23+
24+
o G3toG4:
25+
------
26+
+ Fixed missing inclusion of <assert.h> in G3Division source.
27+
28+
o Geometry:
29+
--------
30+
+ divisions:
31+
o Corrected G4PVDivisionFactory instance accessor.
32+
o Corrected composed cout in exceptions for G4ParameterisationBox
33+
and G4ParameterisationTrd.
34+
+ magneticfield:
35+
o Updated numerical value of the neutron anomaly in G4Mag_SpinEqRhs.
36+
o Removed unused private data-members in G4Mag_UsualEqRhs and
37+
G4RKG3_Stepper.
38+
+ solids/CSG:
39+
o Fix in G4Cons::DistanceToIn(p,v) for initialisation of 'dRmax'
40+
for the case of shape with Rmin1=Rmax1=0.
41+
+ solids/specific:
42+
o Fix in G4ExtrudedSolid::IsSameLine() to use the perpendicular
43+
distance to a line when deciding, and not the y-intercept difference.
44+
Issue responsible for a problem observed in ATLAS in a Boolean
45+
subtraction composition.
46+
o Fix in calculation of normal in G4Tet::DistanceToOut(p,v,..) and
47+
SurfaceNormal(p).
48+
o Fix in G4Polycone::GetPointOnCone() for cases of shape with decreasing
49+
Z. Fixes cases of false report for overlaps detection.
50+
Added check with exception in constructor for polycone with
51+
rInner > rOuter for the same Z.
52+
Addressing problem report #1462.
53+
o G4TessellatedSolid: fixed problem with navigation in solids with
54+
concave surfaces. Addresses problem report #1456.
55+
o Removed unused private data member in G4TwistTrapParallelSide.
56+
57+
o Global:
58+
------
59+
+ G4Pow: fixed bug in interpolation inside logA() and A13() methods,
60+
now interpolation is accurate at better than per mille level; in worse
61+
cases (x~1.45 or x~0.75) better than 2% level.
62+
+ Minor changes to G4ConvergenceTester: output can now optionally be
63+
redirected a different stream (defaults is cout).
64+
Accessors are made public and check if data has been added.
65+
+ Removed unused private members in G4JTPolynomialSolver.
66+
+ Updated date and version for 9.6.p02.
67+
68+
o Graphics Representations:
69+
------------------------
70+
+ HepPolyhedron: introduced 'spatialTolerance' constant, equal to 0.01*nm,
71+
allowing for creation of nm-sized objects.
72+
Addresses problem report #1452.
73+
74+
o Electromagnetic Processes:
75+
-------------------------
76+
+ Adjoint:
77+
o G4AdjointhMultipleScattering: use msc95 instead of obsolete msc90.
78+
o Removed unused variables detected with clang compilation warnings.
79+
+ Muons:
80+
o G4MuPairProductionModel, G4MuBremsstrahlungModel: fixed rare case
81+
of division by zero in cross-section computation.
82+
Addressing problem report #1471.
83+
+ Polarisation
84+
o G4PolarizedComptonCrossSection: removed unused class members.
85+
+ Standard:
86+
o G4UrbanMscModel93/95/96: disabled 'sampleZ' option by default (this
87+
option enables/disables sampling of true step length); helps in
88+
removing rare cases of e+- interactions/decay on geometry boundary
89+
and observed zero step length; a minor (~0.1%) change in sampling
90+
calorimeter response is expected.
91+
Correctly use "static const" for const parameters (minor CPU
92+
speedup).
93+
o G4WentzelOKandVIxSection: use different screening parameter formula
94+
for e+- and other charged particles, improving agreement with data
95+
both for e+- and muons.
96+
97+
o Generic Processes:
98+
-----------------
99+
+ parameterisation:
100+
o Fixed MacOS Clang compiler warning for unused private variable in
101+
G4FastSimulationManagerProcess.
102+
+ Scoring:
103+
o Set verbosity to false in G4ParallelWorldProcess for navigation
104+
in parallel and mass world, reducing warning messages.
105+
+ Transportation:
106+
o G4CoupledTransportation: corrected condition for warning message
107+
in AlongStepDoIt().
108+
o G4CoupledTransportation, G4Transportation: removed unnecessary
109+
static local variables.
110+
o Removed unused data members causing compilation warnings in
111+
MacOS clang.
112+
113+
o Hadronic Processes:
114+
------------------
115+
+ cross_sections:
116+
o G4HadronFissionDataSet: always return zero (only HP may simulate
117+
fission as a separate process).
118+
+ models/im_r_matrix:
119+
o Fix in G4MesonAbsorption for loss of optimisation shortcut.
120+
Addressing problem report #1416.
121+
o Fix in G4CollisionMesonBaryonElastic::IsInCharge(): method always
122+
returned false, effectively blocking meson-baryon elastic.
123+
Expect to change distributions. Addressing problem report #1415.
124+
+ models/lll_fission:
125+
o Fixed MacOS Clang compiler warning for appending int to string
126+
in G4SmpWatt.
127+
+ models/neutron_hp:
128+
o Fixed MacOS clang compiler warnings for unused private variables.
129+
+ models/parton_string/diffraction:
130+
o Fix in G4FTFModel::PutOnMassShell() for K^+ Fe interactions at
131+
T=4.6748 GeV, resolving observed cases of loops in central collision
132+
due to sum of the excitation energy and energies of the ejected
133+
nucleons larger than the initial energy (energy-momentum
134+
non-conservation). Addressing problem report #1459.
135+
+ models/qmd:
136+
o Fixed MacOS Clang compiler warnings for unused private variables in
137+
G4QMDCollision.
138+
+ models/utils:
139+
o G4NuclearFermiDensity: removed unused data member.
140+
+ stopping:
141+
o G4EmCaptureCascade: fixed array initialisation.
142+
o G4MuonMinusBoundDecay: improved muon capture rate data/lookup and
143+
calculation of bound muon decay rate.
144+
Corrected calculations and lookup of MuonCaptureRate in
145+
G4StopElementSelector.
146+
147+
o Parameterisations/gflash
148+
------------------------
149+
+ Fixed compilation warning in clang for unused data member in
150+
GFlashShowerModelMessenger.
151+
152+
o Particles:
153+
---------
154+
+ Removed unused variable of thePDGiSpin from G4PDGCodeChecker.
155+
156+
o Persistency:
157+
-----------
158+
+ ascii:
159+
o Corrected problem in placement of an assembly in G4tgbVolume.
160+
Addressing problem report #1433.
161+
o Removed unused data member in G4tgbRotationMatrix.
162+
o Corrected composed text in exception in G4tgrSolidBoolean.
163+
+ gdml:
164+
o Removed unused data member in G4STRead.
165+
+ mctruth:
166+
o Removed unused data member in G4PersistencyCenter.
167+
168+
o Physics Lists:
169+
-------------
170+
+ Increased low limit from 10 eV to 100 eV in G4EmStandardPhysics_option4,
171+
to fix range of electrons at low energy.
172+
+ G4EmLivermorePhysics: increased low limit to 100 eV and number of bins
173+
for tables to 220 to avoid problems in Livermore ionisation for
174+
electron stopping powers and ranges.
175+
176+
o Track:
177+
-----
178+
+ Fix in G4ParticleChange for velocity of neutrons and recoil in elastic
179+
scattering; correspondingly, fixed time of neutron hits in calorimeters.
180+
Addressing problem report #1451.
181+
+ G4ParticleChangeForEloss, G4ParticleChangeForGamma: clean up (o)
182+
computation of velocity (expected little performance improvement).
183+
184+
o Tracking:
185+
--------
186+
+ Fix in G4SteppingManager to allow for proper handling of multiple AtRest
187+
processes. Addressing problem report #1397.
188+
189+
o Examples:
190+
--------
191+
+ Updated reference outputs.
192+
+ advanced/composite_calorimeter:
193+
o Fixed compilation error in main() for missing inclusion of
194+
G4UImanager header. Fixed compilation warnings for
195+
variables/parameters shadowing.
196+
+ advanced/lAr_calorimeter:
197+
o Fixed bug in the primary generator, causing event abortion.
198+
+ novice/N02:
199+
o ExN02PhysicsList: added ions. Addressing problem report #1444.
200+
201+
----------------------------------------------------------------------------
202+
203+
Technical Notes
204+
---------------
205+
206+
o This patch should be applied on top of release 9.6.
207+
o Technical notes distributed for release 9.6 are also applicable and
208+
valid for this patch.
209+
210+
The code and rebuilt binary libraries for release 9.6.p02 are available
211+
through our "Download" Web page:
212+
http://cern.ch/geant4/support/download.shtml
213+
214+
Please refer to the Geant4 User Documentation:
215+
http://cern.ch/geant4/support/userdocuments.shtml
216+
for further information about using Geant4.

cmake/INSTALL.g4cmake

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -168,27 +168,27 @@ http://geant4.cern.ch
168168
3) Unpack the source package to a location of your choice. As an illustration,
169169
this guide will assume it's been unpacked to
170170

171-
/path/to/geant4.9.6.1
171+
/path/to/geant4.9.6.2
172172

173173
4) IF YOU ARE ON LINUX OR MAC OS X ('UNIX'):
174174
4.1) Create a directory alongside the source directory in which to
175175
perform the build, e.g. using our directory from above
176176

177177
$ cd /path/to
178-
$ mkdir geant4.9.6.1-build
178+
$ mkdir geant4.9.6.2-build
179179
$ ls
180-
geant4.9.6.1 geant4.9.6.1-build
180+
geant4.9.6.2 geant4.9.6.2-build
181181

182182
4.2) Change to this build directory and run cmake, pointing it to the
183183
location of the unpacked sources, e.g. carrying on from above
184184

185-
$ cd geant4.9.6.1-build
186-
$ cmake ../geant4.9.6.1
185+
$ cd geant4.9.6.2-build
186+
$ cmake ../geant4.9.6.2
187187

188188
CMake will then run to configure and generate standard Makefiles,
189189
and on Linux you should see output similar to
190190

191-
$ cmake ../geant4.9.6.1
191+
$ cmake ../geant4.9.6.2
192192
-- The C compiler identification is GNU
193193
-- The CXX compiler identification is GNU
194194
-- Check for working C compiler: /usr/bin/gcc
@@ -205,7 +205,7 @@ http://geant4.cern.ch
205205

206206
-- Configuring done
207207
-- Generating done
208-
-- Build files have been written to: /path/to/geant4.9.6.1
208+
-- Build files have been written to: /path/to/geant4.9.6.2
209209

210210
On Mac OS X this output will be slightly different!
211211

@@ -762,7 +762,7 @@ and installed it to
762762

763763
+- /usr/local
764764
+- lib/
765-
+- Geant4-9.6.1
765+
+- Geant4-9.6.2
766766
+- Geant4Config.cmake
767767

768768
where we've illustrated the location of the Geant4Config files in the two trees.
@@ -788,7 +788,7 @@ install tree, instead doing:
788788
$ cd /home/geant4/exampleN01
789789
$ mkdir build-N01
790790
$ cd build-N01
791-
$ cmake -DGeant4_DIR=/usr/local/lib/geant4-9.6.1 ..
791+
$ cmake -DGeant4_DIR=/usr/local/lib/geant4-9.6.2 ..
792792
$ make -jN
793793
$ ./exampleN01
794794

@@ -849,11 +849,11 @@ then be compiled with the appropriate flags to enable it.
849849

850850
You can also pass version numbers to select a minimum version of Geant4:
851851

852-
find_package(Geant4 9.6.1 REQUIRED)
852+
find_package(Geant4 9.6.2 REQUIRED)
853853

854854
or even an exact version
855855

856-
find_package(Geant4 9.6.1 EXACT REQUIRED)
856+
find_package(Geant4 9.6.2 EXACT REQUIRED)
857857

858858
There are many other things you can do with find_package and CMake to build,
859859
install and package geant4 based applications. You should consult the
@@ -917,7 +917,7 @@ and installed it to
917917

918918
+- /usr/local
919919
+- share/
920-
+- Geant4-9.6.1
920+
+- Geant4-9.6.2
921921
+- geant4-environment-setup.(c)sh
922922

923923
where we've illustrated the location of the geant4-environment-setup.(c)sh
@@ -931,7 +931,7 @@ $ source /home/geant4/build/geant4-environment-setup.(c)sh
931931
Or, if you want to build your application using the Install Tree of Geant4,
932932
simply source the script in the Install Tree, e.g.
933933

934-
$ source /usr/local/share/Geant4-9.6.1/geant4-environment-setup.(c)sh
934+
$ source /usr/local/share/Geant4-9.6.2/geant4-environment-setup.(c)sh
935935

936936
Your environment will then be configured to build applications using the Geant4
937937
GNU Makefile system as described in the Application Developers Guide:

examples/advanced/amsEcal/run1.out

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

66
*************************************************************
7-
Geant4 version Name: geant4-09-06-ref-00 (30-November-2012)
7+
Geant4 version Name: geant4-09-06-patch-02 (17-May-2013)
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.31s Real=19.97s Sys=0.29s
185+
User=18.37s Real=29.67s Sys=0.27s
186186

187187
-------------------------------------------------------------
188188
---> The calorimeter is 9 Modules
@@ -205,34 +205,34 @@ Run Summary
205205

206206
visible Energy (rms/mean) total Energy (rms/mean)
207207

208-
layer 0: 812.91 keV +- 2.088 MeV (2.6e+02 %) 9.3025 MeV +- 6.182 MeV ( 66 %)
209-
layer 1: 784.7 keV +- 1.493 MeV (1.9e+02 %) 8.2351 MeV +- 5.543 MeV ( 67 %)
210-
layer 2: 772.26 keV +- 1.416 MeV (1.8e+02 %) 8.5294 MeV +- 5.269 MeV ( 62 %)
211-
layer 3: 785.92 keV +- 1.78 MeV (2.3e+02 %) 8.2092 MeV +- 5.384 MeV ( 66 %)
212-
layer 4: 807.95 keV +- 1.943 MeV (2.4e+02 %) 8.512 MeV +- 5.384 MeV ( 63 %)
213-
layer 5: 799.2 keV +- 1.932 MeV (2.4e+02 %) 8.1386 MeV +- 5.136 MeV ( 63 %)
214-
layer 6: 792.36 keV +- 1.598 MeV (2e+02 %) 8.4777 MeV +- 5.053 MeV ( 60 %)
215-
layer 7: 789.57 keV +- 1.578 MeV (2e+02 %) 8.1608 MeV +- 5.363 MeV ( 66 %)
216-
layer 8: 773.02 keV +- 1.1 MeV (1.4e+02 %) 8.5272 MeV +- 5.169 MeV ( 61 %)
217-
layer 9: 779.56 keV +- 1.31 MeV (1.7e+02 %) 8.0245 MeV +- 4.694 MeV ( 58 %)
218-
layer 10: 813.87 keV +- 2.092 MeV (2.6e+02 %) 8.4058 MeV +- 4.985 MeV ( 59 %)
219-
layer 11: 768.9 keV +- 952.3 keV (1.2e+02 %) 8.0339 MeV +- 4.413 MeV ( 55 %)
220-
layer 12: 772.47 keV +- 1.393 MeV (1.8e+02 %) 8.4505 MeV +- 5.143 MeV ( 61 %)
221-
layer 13: 783.43 keV +- 1.438 MeV (1.8e+02 %) 8.0515 MeV +- 4.712 MeV ( 59 %)
222-
layer 14: 767.97 keV +- 1.119 MeV (1.5e+02 %) 7.5708 MeV +- 4.762 MeV ( 63 %)
223-
layer 15: 781.28 keV +- 1.352 MeV (1.7e+02 %) 8.9746 MeV +- 4.986 MeV ( 56 %)
224-
layer 16: 780.05 keV +- 1.361 MeV (1.7e+02 %) 8.4043 MeV +- 5.033 MeV ( 60 %)
225-
layer 17: 804.8 keV +- 1.783 MeV (2.2e+02 %) 7.4745 MeV +- 4.959 MeV ( 66 %)
226-
227-
total calor : 14.17 MeV +- 6.653 MeV ( 47 %) 149.48 MeV +- 21.48 MeV ( 14 %)
208+
layer 0: 788.69 keV +- 1.505 MeV (1.9e+02 %) 9.2148 MeV +- 5.978 MeV ( 65 %)
209+
layer 1: 812.31 keV +- 1.759 MeV (2.2e+02 %) 8.1214 MeV +- 5.35 MeV ( 66 %)
210+
layer 2: 763.45 keV +- 1.43 MeV (1.9e+02 %) 8.6033 MeV +- 5.875 MeV ( 68 %)
211+
layer 3: 795.5 keV +- 1.701 MeV (2.1e+02 %) 8.1401 MeV +- 5.392 MeV ( 66 %)
212+
layer 4: 770.75 keV +- 1.557 MeV (2e+02 %) 8.4691 MeV +- 5.243 MeV ( 62 %)
213+
layer 5: 767.45 keV +- 1.125 MeV (1.5e+02 %) 8.1793 MeV +- 5.351 MeV ( 65 %)
214+
layer 6: 782.94 keV +- 1.45 MeV (1.9e+02 %) 8.4527 MeV +- 4.996 MeV ( 59 %)
215+
layer 7: 800.96 keV +- 1.576 MeV (2e+02 %) 8.0892 MeV +- 5.011 MeV ( 62 %)
216+
layer 8: 777.67 keV +- 1.41 MeV (1.8e+02 %) 8.5091 MeV +- 5.327 MeV ( 63 %)
217+
layer 9: 783.73 keV +- 1.396 MeV (1.8e+02 %) 8.002 MeV +- 4.374 MeV ( 55 %)
218+
layer 10: 828.36 keV +- 1.872 MeV (2.3e+02 %) 8.3944 MeV +- 4.761 MeV ( 57 %)
219+
layer 11: 759.34 keV +- 1.134 MeV (1.5e+02 %) 8.1711 MeV +- 5.111 MeV ( 63 %)
220+
layer 12: 798.69 keV +- 1.578 MeV (2e+02 %) 8.4471 MeV +- 5.161 MeV ( 61 %)
221+
layer 13: 800.05 keV +- 1.562 MeV (2e+02 %) 8.0215 MeV +- 4.757 MeV ( 59 %)
222+
layer 14: 788.49 keV +- 1.469 MeV (1.9e+02 %) 7.4611 MeV +- 4.312 MeV ( 58 %)
223+
layer 15: 793.62 keV +- 1.609 MeV (2e+02 %) 8.9744 MeV +- 5.313 MeV ( 59 %)
224+
layer 16: 769.53 keV +- 1.14 MeV (1.5e+02 %) 8.4836 MeV +- 4.933 MeV ( 58 %)
225+
layer 17: 794.22 keV +- 1.623 MeV (2e+02 %) 7.3469 MeV +- 4.321 MeV ( 59 %)
226+
227+
total calor : 14.176 MeV +- 6.402 MeV ( 45 %) 149.08 MeV +- 21.39 MeV ( 14 %)
228228
------------------------------------------------------------
229229

230-
Leakage : 850.52 MeV +- 21.48 MeV
230+
Leakage : 850.92 MeV +- 21.39 MeV
231231
Eleak/Ebeam =85.1 % ( forward =85.1 % backward = 0 % lateral = 0 %)
232232

233233
--------- Ranecu engine status ---------
234234
Initial seed (index) = 0
235-
Current couple of seeds = 1419903579, 1364644369
235+
Current couple of seeds = 750051704, 1071636706
236236
----------------------------------------
237237
G4 kernel has come to Quit state.
238238
UserDetectorConstruction deleted.

0 commit comments

Comments
 (0)