Skip to content

Commit 9715699

Browse files
gcosmogcosmo
committed
Import Geant4 9.6.1 source tree
1 parent e2d2f98 commit 9715699

File tree

296 files changed

+5302
-5466
lines changed

Some content is hidden

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

296 files changed

+5302
-5466
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.0")
55+
set(${PROJECT_NAME}_VERSION "9.6.1")
5656
set(${PROJECT_NAME}_VERSION_MAJOR "9")
5757
set(${PROJECT_NAME}_VERSION_MINOR "6")
58-
set(${PROJECT_NAME}_VERSION_PATCH "0")
58+
set(${PROJECT_NAME}_VERSION_PATCH "1")
5959

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

‎ReleaseNotes/Patch4.9.6-1.txt‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
2+
Geant4 9.6 - patch-01 Release Notes
3+
-----------------------------------
4+
5+
1 February 2013
6+
7+
List of fixes included in this public patch since the public release 9.6:
8+
9+
o Event:
10+
-----
11+
+ Fixed missing deletion of UI command in destructor of G4StackMessenger.
12+
Addressing problem report #1380.
13+
14+
o Geometry:
15+
--------
16+
+ navigation:
17+
o Cleared left-over debug check in G4VoxelNavigation.
18+
Addressing problem report #1406.
19+
+ solids/specific:
20+
o Fixed cases of hang-ups in G4ExtrudedSolid on 32-bits platforms, due to
21+
G4TessellatedSolid and G4SurfVoxelizer, caused by accessing bitmask
22+
arrays with negative indexes. The problem was related to floating-point
23+
rounding, which can be different even on same platform with
24+
debug/release version.
25+
Assuring same number of computed voxels on 32-bit/64-bit platforms.
26+
Fixed error in SetVertexIndex() method, which might cause problems on
27+
certain configurations. Fixed minor memory leaks.
28+
Code cleanup for use of G4endl and tabs...
29+
o Fixed condition in G4VTwistSurface::GetBoundaryLimit() for logical
30+
error. Addressing problem report #1420.
31+
32+
o Global:
33+
------
34+
+ Updated date and version for 9.6.p01.
35+
36+
o Electromagnetic Processes:
37+
-------------------------
38+
+ High Energy:
39+
o G4eeTo3PiModel: removed printout from destructor.
40+
Addressing problem report #1404.
41+
o G4mplIonisationWithDeltaModel: fixed min and max energy
42+
of delta-electron production.
43+
+ Low Energy:
44+
o G4LivermorePhotoElectricModel: fix addressing problem report #1402.
45+
o G4UAtomDeexcitation: removed shortcut when Auger is activated.
46+
+ Standard:
47+
o Fixed signature of SampleScattering() for all multiple-scattering
48+
models. Addressing problem report #1403.
49+
o G4UrbanMscModel93, G4UrbanMscModel95, G4UrbanMscModel96: added limit
50+
for the main parameter responsible for sampling of scattering tail (fix
51+
for ATLAS large scattering angle problem).
52+
Use safer expression in SampleCosineTheta() to avoid numerical problems.
53+
Extended initialisation at StartTracking() method: class members are
54+
reset to default values to avoid rare cases of non-reproducibility.
55+
o G4UrbanMscModel96: optimised tuning of Urban model.
56+
+ Utils:
57+
o G4VMultipleScattering, G4VMscModel: fixed signature of method
58+
SampleScattering(). Use momentum direction from PostStepPoint instead
59+
of G4DynamicParticle.
60+
Fixing major bug of migration of multiple-scattering sampling from
61+
PostStepDoIt() to AlongStepDoIt(), responsible for observed
62+
mis-behavior in presence of magnetic-field.
63+
Addressing problem report #1403.
64+
65+
o Generic Processes:
66+
-----------------
67+
+ Transportation:
68+
o Corrected condition for warning message in method AlongStepDoIt()
69+
of G4Transportation.
70+
71+
o Hadronic Processes:
72+
------------------
73+
+ cross_sections:
74+
o Fixed memory leak in cross-sections for GetZandACrossSection().
75+
Addressing problem report #1424.
76+
o Fixed bug to G4ComponentAntiNuclNuclearXS and added class description.
77+
Fixed case of non-reproducibility observed with QBBC physics-list:
78+
consider anti-protons and anti-neutrons as default particles, so that
79+
they can be used also for anti-hyperons.
80+
o Fixed several Coverity defects for initialisation of class members.
81+
+ models/coherent_elastic:
82+
o Fixed conditional statement depending on uninitialised variable.
83+
+ models/de_excitation:
84+
o Fix in G4ExcitationHandler: if FermiBreakUp returns unchanged
85+
fragment then the fragment is decayed by Evaporation instead of
86+
PhotonEvaporation to avoid production of non-physical isotopes
87+
like 4H.
88+
+ models/im_r_matrix:
89+
o Fix in G4Scatterer::GetTimeToInteraction(); one shortcut in the
90+
calculation of time was missed, as only one of the two particles was
91+
checked. Physics unchanged, but small performance gain of few percent.
92+
Addressing problem report #1334.
93+
+ models/inclxx:
94+
o Updated to INCL++ v5.1.9: removed calls to abort() and exit().
95+
Addressing problem report #1421.
96+
+ models/neutron_hp:
97+
o Fixed improper use of abort() in G4NeutronHPThermalScattering.
98+
Addressing problem report #1421.
99+
+ models/qmd:
100+
o Fix for logic error in G4QMDGroundStateNucleus::packNucleons().
101+
Addressing problem report #1418.
102+
+ models/radioactive_decay:
103+
o G4RadioactiveDecay: force boost of the decay products. The parent
104+
energy considered in the boost is the total energy of the fully
105+
stripped parent ion rather than the total energy of dynamic ion
106+
where the energy of shell electrons is taken into account.
107+
Some difference in momentum and energy balance is still observed
108+
but much less than before. Addressing problem report #1359.
109+
110+
o Materials:
111+
---------
112+
+ G4NistMaterialBuilder: fixed stainless steel parameters, taken from
113+
http://www.azom.com/article.aspx?ArticleID=965.
114+
115+
o Physics Lists:
116+
-------------
117+
+ G4EmStandardPhysics_option4: substituted new low-energy Compton
118+
model by old LivermoreCompton model to avoid numerical problems
119+
in high statistic runs.
120+
121+
o Tracking:
122+
--------
123+
+ Replaced plain printout to cerr with G4Exception warning in
124+
G4SteppingManager::InvokeAtRestDoItProcs().
125+
Addressing problem report #1421.
126+
127+
o Examples:
128+
--------
129+
+ Updated reference outputs.
130+
+ advanced/nanobeam:
131+
o Corrected order and format of inclusion of CLHEP headers.
132+
+ advanced/underground_physics:
133+
o Fixed case of missing inclusion of units header when analysis activated.
134+
o Make Auger, fluorescence and PIXE on by default.
135+
Addressing problem report #1386.
136+
+ extended/electromagnetic/TestEm7:
137+
o G4ScreenedNuclearRecoil: define type and sub-type of process;
138+
removed inlusion of obsolete header
139+
o PhysListEmStandardNR: use standard electron ionisation instead
140+
of Penelope, use multiple scattering for ions above 100 MeV/u.
141+
o PhysListEmStandard: use SetEmModel() method.
142+
o RunAction: delete analysis manager and all histograms at the end of run.
143+
o c2_function: fixes for variable shadowing.
144+
o Removed use of obsolete class G4HadronQElasticPhysics.
145+
+ extended/exoticphysics/monopole:
146+
o Fixed computation of monopole range.
147+
148+
----------------------------------------------------------------------------
149+
150+
Technical Notes
151+
---------------
152+
153+
o This patch should be applied on top of release 9.6.
154+
o Technical notes distributed for release 9.6 are also applicable and
155+
valid for this patch.
156+
157+
The code and rebuilt binary libraries for release 9.6.p01 are available
158+
through our "Download" Web page:
159+
http://cern.ch/geant4/support/download.shtml
160+
161+
Please refer to the Geant4 User Documentation:
162+
http://cern.ch/geant4/support/userdocuments.shtml
163+
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.0
171+
/path/to/geant4.9.6.1
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.0-build
178+
$ mkdir geant4.9.6.1-build
179179
$ ls
180-
geant4.9.6.0 geant4.9.6.0-build
180+
geant4.9.6.1 geant4.9.6.1-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.0-build
186-
$ cmake ../geant4.9.6.0
185+
$ cd geant4.9.6.1-build
186+
$ cmake ../geant4.9.6.1
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.0
191+
$ cmake ../geant4.9.6.1
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.0
208+
-- Build files have been written to: /path/to/geant4.9.6.1
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.0
765+
+- Geant4-9.6.1
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.0 ..
791+
$ cmake -DGeant4_DIR=/usr/local/lib/geant4-9.6.1 ..
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.0 REQUIRED)
852+
find_package(Geant4 9.6.1 REQUIRED)
853853

854854
or even an exact version
855855

856-
find_package(Geant4 9.6.0 EXACT REQUIRED)
856+
find_package(Geant4 9.6.1 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.0
920+
+- Geant4-9.6.1
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.0/geant4-environment-setup.(c)sh
934+
$ source /usr/local/share/Geant4-9.6.1/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/nanobeam/History‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------
2-
$Id: History,v 1.11 2010-11-09 23:36:31 asaim Exp $
2+
$Id$
33
-------------------------------------------------------------------
44

55
=========================================================
@@ -8,8 +8,12 @@ $Id: History,v 1.11 2010-11-09 23:36:31 asaim Exp $
88

99
Package History file
1010
--------------------
11+
12+
4 December 2012 - tag nanobeam-V09-05-07 - G. Cosmo
13+
- Corrected order and format of inclusion of CLHEP headers.
14+
1115
14 November 2012 - tag nanobeam-V09-05-06 - P. Mato
12-
- fix compilation warning and corrected CMakeLists.txt
16+
- Fixed compilation warning and corrected CMakeLists.txt
1317

1418
3 November 2012 - tag nanobeam-V09-05-05 - S. Incerti
1519
- Removed shadowing in SteppingAction and TabulatedField3D

‎examples/advanced/nanobeam/include/PrimaryGeneratorAction.hh‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
#ifndef PrimaryGeneratorAction_h
3131
#define PrimaryGeneratorAction_h 1
3232

33+
#include <CLHEP/Matrix/Matrix.h>
34+
3335
#include "globals.hh"
3436
#include "Randomize.hh"
3537

@@ -41,8 +43,6 @@
4143
#include "DetectorConstruction.hh"
4244
#include "PrimaryGeneratorMessenger.hh"
4345

44-
#include "CLHEP/Matrix/Matrix.h"
45-
4646
class PrimaryGeneratorMessenger;
4747

4848
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -74,9 +74,7 @@ private:
7474
G4bool shoot;
7575

7676
// Matrix
77-
CLHEP::HepMatrix beamMatrix;
78-
79-
77+
CLHEP::HepMatrix beamMatrix;
8078
};
8179

8280
#endif

‎examples/advanced/nanobeam/include/RunAction.hh‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
#ifndef RunAction_h
3131
#define RunAction_h 1
3232

33-
#include "G4UserRunAction.hh"
33+
#include <CLHEP/Matrix/Vector.h>
34+
#include <CLHEP/Matrix/Matrix.h>
35+
3436
#include "globals.hh"
35-
#include <iostream>
36-
#include "CLHEP/Matrix/Matrix.h"
37-
#include "CLHEP/Matrix/Vector.h"
37+
#include "G4UserRunAction.hh"
3838

3939
#include "DetectorConstruction.hh"
4040
#include "PrimaryGeneratorAction.hh"
@@ -80,16 +80,3 @@ private:
8080
};
8181

8282
#endif
83-
84-
85-
86-
87-
88-
89-
90-
91-
92-
93-
94-
95-

‎examples/advanced/nanobeam/src/RunAction.cc‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,26 @@
2727
// $Id$
2828
// -------------------------------------------------------------------
2929

30-
#include "G4SteppingManager.hh"
31-
#include "G4Run.hh"
32-
#include "G4Material.hh"
33-
#include "G4UImanager.hh"
34-
#include "G4ios.hh"
35-
#include "G4UnitsTable.hh"
36-
37-
#include "Randomize.hh"
3830
#include <iomanip>
39-
#include <assert.h>
40-
41-
#include "RunAction.hh"
42-
43-
// MATRIX
44-
#define MATRIX_BOUND_CHECK
45-
#include "globals.hh"
4631
#include <iostream>
47-
#include "CLHEP/Matrix/Matrix.h"
48-
#include "CLHEP/Matrix/Vector.h"
4932
#include <fstream>
50-
#include "G4ios.hh"
5133
#include <fstream>
5234
#include <vector>
5335
#include <cmath>
36+
37+
// #define MATRIX_BOUND_CHECK
38+
39+
#include "RunAction.hh"
40+
41+
#include "G4ios.hh"
42+
#include "Randomize.hh"
43+
44+
#include "G4SteppingManager.hh"
45+
#include "G4Run.hh"
46+
#include "G4Material.hh"
47+
#include "G4UImanager.hh"
48+
#include "G4UnitsTable.hh"
49+
5450
using namespace std;
5551

5652
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

0 commit comments

Comments
 (0)