Skip to content

Commit 800cc03

Browse files
gcosmogcosmo
committed
Import Geant4 9.2.1 source tree
1 parent b79225f commit 800cc03

File tree

401 files changed

+5684
-2766
lines changed

Some content is hidden

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

401 files changed

+5684
-2766
lines changed

‎Configure

+5-4
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
# you may fetch it yourself from your nearest archive site.)
1919
#
2020

21-
# $Id: Configure,v 1.110 2008/12/03 15:34:57 bmorgan Exp $
21+
# $Id: Configure,v 1.110.2.1 2009/03/03 13:59:55 gcosmo Exp $
2222
#
23-
# Generated on Wed Dec 3 15:33:49 GMT 2008 [metaconfig 3.0 PL70]
23+
# Generated on Thu Jan 22 14:06:57 GMT 2009 [metaconfig 3.0 PL70]
2424

2525
cat >/tmp/c1$$ <<EOF
2626
WARNING!!!!!
@@ -3217,7 +3217,7 @@ while test "x$promptend" = "xno" ; do
32173217
$echo $n "checking for $g4data_g4emlow_version... $c"
32183218
if test -d "$g4data/$g4data_g4emlow_version" ; then
32193219
$echo "yes"
3220-
g4ledata=$g4data/$g4data_emlow_version
3220+
g4ledata=$g4data/$g4data_g4emlow_version
32213221
else
32223222
$echo "no"
32233223
g4data_foundall="no"
@@ -3237,7 +3237,7 @@ while test "x$promptend" = "xno" ; do
32373237
$echo $n "checking for $g4data_g4abla_version... $c"
32383238
if test -d "$g4data/$g4data_g4abla_version" ; then
32393239
$echo "yes"
3240-
g4levelgammadata=$g4data/$g4data_g4abla_version
3240+
g4abladata=$g4data/$g4data_g4abla_version
32413241
else
32423242
$echo "no"
32433243
g4data_foundall="no"
@@ -3296,6 +3296,7 @@ EOM`
32963296
32973297
else
32983298
#try again
3299+
g4data_foundall=yes
32993300
g4data=$gans
33003301
fi
33013302
fi

‎ReleaseNotes/Patch4.9.2-1.txt

+216
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,216 @@
1+
2+
Geant4 9.2 - patch-01 Release Notes
3+
-----------------------------------
4+
5+
13 March 2009
6+
7+
List of fixes included in this public patch since the public release 9.2:
8+
9+
o Configuration:
10+
-------------
11+
+ Configure script: corrected handling of G4LEDATA and G4LEVELGAMMADATA
12+
paths in generated configuration scripts.
13+
Addresses problem report #1037 and #1039.
14+
+ common.gmk, globlib.gmk source/GNUmakefile: remove moc sources in clean
15+
targets.
16+
+ Linux-g++.gmk: simplified Qt setup to conform to standard Qt installation.
17+
+ Added -lXi to X11LIBS for Linux-g++, Linux-icc and WIN32-g++
18+
configurations, required for correct linkage with OpenInventor Coin3D
19+
libraries.
20+
21+
o Digits_Hits:
22+
-----------
23+
+ Fixed incorrect volume size for cylindrical parameterized volume used
24+
in various scorers.
25+
26+
o Geometry:
27+
--------
28+
+ navigation:
29+
o Fixed problem in G4BrentLocator::EstimateIntersectionPoint() responsible
30+
for rare cases of negative steps.
31+
o Added G4RegularNavigationHelper class, used by G4RegularNavigation for
32+
counting the number of step lengths in each voxel of the regular
33+
structure. Forgotten inclusion in 9.2.
34+
o Some code cleanup...
35+
+ solids/specific:
36+
o Fix in G4Paraboloid::DistanceToOut(p,v,..) for the computation of
37+
normal to surface; added missing normalisation to unit, following
38+
remark in the Geometry Forum Hypernews posting #953.
39+
40+
o Global:
41+
------
42+
+ Correction in management/GNUmakefile to CPPFLAGS, adding G4RF_DEBUG
43+
in case enabled.
44+
+ Changed date for patch-01 to release 9.2.
45+
46+
o Low-energy Electromagnetic Processes:
47+
------------------------------------
48+
+ Suppressed warning message in Penelope PhotoElectric process
49+
(G4PenelopePhotoElectric and G4PenelopePhotoElectricModel) from
50+
G4AtomicTransitionManager appearing for some elements (Oxygen, Fluorine).
51+
+ Corrected energy limits in G4CrossSectionIonisationBornPartial.
52+
+ Added proton case in G4CrossSectionExcitationMillerGreenPartial
53+
and added protection for water excitation energy.
54+
+ Added 'kill particle without total energy deposit' feature for
55+
DNA charge change processes.
56+
+ Added protections against FPE in G4hLowEnergyLoss.
57+
+ Fixes problem report 953 (also report in Hypernews EM forum #893).
58+
+ Fixed bug for ICRU73 ion model.
59+
60+
o Materials:
61+
---------
62+
+ G4MaterialStoppingICRU73: added 4 missing materials from ICRU'73.
63+
+ G4SimpleMaterialStoppingICRU73: fixed typo in density of Mo.
64+
65+
o Hadronic Processes:
66+
------------------
67+
+ cross_sections:
68+
o Improvements for clearing of memory at end of application:
69+
+ G4CrossSectionDataStore: added Clean() method; constructor and
70+
destructor no longer inline; added destruction of data sets;
71+
use std::vector instead of flat arrays.
72+
+ G4CrossSectionDataSetRegistry: new singleton to keep pointers to
73+
cross-section data sets.
74+
+ G4VCrossSectiondataSet: constructor and detructor no longer inline;
75+
added registration/deregistration mechanism.
76+
+ management:
77+
o G4HadronicProcessStore: activated destruction of processes at
78+
application closure; added Clean() method and cleanup of model and
79+
cross section stores.
80+
+ models/cascade:
81+
o Corrected absorption coefficient to be set to 1.0 instead of 0.2
82+
inside G4CascadSpecialFunctions. Small differences are observed for
83+
calorimeter observables in Bertini physics-lists, resulting in slightly
84+
wider lateral shower shapes.
85+
+ models/chiral_inv_phase_space/interface
86+
o Added de-registration in destructor of G4QCaptureAtRest.
87+
o Added string decay destruction to G4ElectroNuclearReaction.
88+
+ models/de_excitation:
89+
o Added smearing of Coloumb barriers for d, t, he3 and alpha particles.
90+
o Fix in G4FissionProbability for computation of EmissionProbability();
91+
returned value was wrong due to missing parenthesis in the
92+
implementation of the formula.
93+
o Fix to substitute 'hbar_Plank' with 'hbarc' in G4EvaporationProbability.
94+
o Fixed leaks in singleton classes in the util module.
95+
o Corrected some inlining of constructors/destructors for base classes
96+
and usage of virtual specification.
97+
+ models/management:
98+
o G4HadronicInteractionRegistry: modified to conform to singleton
99+
definition.
100+
o G4HadronicInteraction, G4InelasticInteraction: made constructor,
101+
destructor and some other methods not inline.
102+
+ models/photolepton_hadron/muon_nuclear
103+
o Added de-registration of G4MuNuclearInteraction process.
104+
+ models/pre_equilibrium:
105+
o G4PreCompoundIon: fixed probability of light ion emission.
106+
o G4PreCompoundXXX: added decrease of Coulomb barrier for d, t, a, he3.
107+
o Some cleanup of comments and formatting...
108+
+ stopping:
109+
o Activated registration/de-registration for all LHEP processes.
110+
+ util:
111+
o G4StableIsotopes: filled in missing isotope names.
112+
113+
o Generic Processes:
114+
-----------------
115+
+ Optical:
116+
o Fix to G4OpBoundaryProcess to address problem report #1040.
117+
118+
o Persistency:
119+
-----------
120+
+ ascii:
121+
o Fix in delta theta for handling of G4Sphere, and renaming 'phiTotal'
122+
to 'phiDelta' for the relevant solids in G4tgbVolume implementation.
123+
o Bug fix in definition of delta angle for all solids with section in
124+
Phi in G4tgbVolume. Take into consideration tolerance.
125+
+ gdml:
126+
o Fixed association of entities in nested loops for solids and materials.
127+
o Strip off white spaces from names G4GDMLWrite::GenerateName(), to avoid
128+
parsing problems in imported files.
129+
o Corrected treatment of brackets and indeces for matrices in
130+
G4GDMLEvaluator. Fixes problem report #1048.
131+
o Fix in G4GDMLStructure class for missing caching of auxiliary
132+
information from child modules, causing auxiliary information defined
133+
within separated modules to get lost and therefore not assigned to
134+
volumes. Fixes problem report #1049.
135+
o Changed post-fix"_refl" to "_PV" for placements made through the
136+
reflection-factory.
137+
o Added possibility to check overlaps by activating/de-activating the
138+
built-in surface check for placement and parameterised volumes.
139+
By default the overlap check is off. To activate it, use call to the
140+
parser 'SetOverlapCheck(true)' before reading the GDML file.
141+
Required for resolving overlap issues fixed above.
142+
143+
o Particles:
144+
---------
145+
+ Fixed values of masses for light ions.
146+
+ Optimised G4IonTable::IsIon() implementation for usage of strings.
147+
148+
o Physics Lists:
149+
-------------
150+
+ G4HadronInelasticQBBC: use G4StringChipsParticleLevelInterface instead
151+
of obsolete G4StringChipsInterface.
152+
+ G4MiscLHEPBuilder: create processes dynamically for proper deletion at
153+
the end of job.
154+
155+
o Tracking:
156+
--------
157+
+ Fixed issue in G4SteppingManager for the special cases of skipping voxel
158+
boundaries in G4RegularNavigation.
159+
160+
o Visualization:
161+
-------------
162+
+ Fixed problem in ratio and geometry on X/Xm/Qt/Win32 viewers.
163+
Now possible to pass XString like 400x600-0+0 to viewers, set position
164+
and location.
165+
+ Corrected use of G4DEBUG with G4DEBUG_VIS_OGL in OpenGL-Qt code.
166+
167+
o Examples:
168+
--------
169+
+ advanced/brachytherapy:
170+
o Fixed compilation errors and warnings when G4ANALYSIS_USE is not set.
171+
+ advanced/composite_calorimeter:
172+
o Fixed compilation warnings in CCalRunAction and CCalEndOfEventAction.
173+
+ advanced/hadrontherapy:
174+
o Fixed a compilation warnings in HIIonLEP.
175+
+ advanced/human_phantom:
176+
o Migrated GDML read setup to use embedded GDML reader as in Geant4 9.2.
177+
o Corrected URL for standard location of schema in all GDML files.
178+
o Use "OrganPos" and "OrganRot" as names for organs's transformations in
179+
ORNL files, as implied by code.
180+
o Fixed 'solids' tag in ORNLLeftLegBone.gdml files for male and female.
181+
o Fixed compilation warnings and updated README.
182+
+ advanced/microbeam:
183+
o Correction in MicrobeamEMField to use logical '&&', not bit '&' in
184+
conditional statements.
185+
+ advanced/nanobeam:
186+
o Correction in TabulatedField3D to use logical '&&', not bit '&' in
187+
conditional statements.
188+
+ extended/medical/DICOM:
189+
o Added report on dose per voxel.
190+
o Fixed use pf class G4RegularNavigationHistory for counting of step
191+
lengths in voxels of the regular structure; forgotten inclusion in
192+
release 9.2.
193+
+ extended/persistency/gdml/G02:
194+
o Guarded usage of G4UITCSH with G4UI_USE_TCSH flag, to allow for
195+
compilation on Windows.
196+
o Added visualization properties for world volume in DetectorConstruction
197+
to avoid run-time warning.
198+
o Corrected loading of default geometry with assembly, resolving some
199+
overlaps introduced by mistake.
200+
201+
----------------------------------------------------------------------------
202+
203+
Technical Notes
204+
---------------
205+
206+
o This patch should be applied on top of release 9.2
207+
o Technical notes distributed for release 9.2 are also applicable and
208+
valid for this patch.
209+
210+
The code and rebuilt binary libraries for release 9.2 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.

‎config/History

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cvs log $Id: History,v 1.344 2008/12/09 11:20:58 gcosmo Exp $
1+
cvs log $Id: History,v 1.344.2.1 2009/03/03 11:13:05 gcosmo Exp $
22
-------------------------------------------------------------------
33

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

19+
27th February 2009 Gabriele Cosmo (config-V09-01-18)
20+
- common.gmk, globlib.gmk: added removal of moc sources in clean target.
21+
22+
26th February 2009 Gabriele Cosmo
23+
- Linux-g++.gmk: simplified Qt setup to conform to standard Qt installation.
24+
25+
9th January 2009 Gabriele Cosmo
26+
- Added -lXi to X11LIBS for Linux-g++, Linux-icc and WIN32-g++ configurations,
27+
required for correct linkage with OpenInventor Coin3D libraries (suggestion
28+
by F.Jones).
29+
1930
9th December 2008 Guy Barrand (config-V09-01-17)
2031
- G4UI_USE.gmk: corrected G4UI_USE_OSC to use $(shell ...) instead
2132
of direct backquoting to solve a tricky env expansion problem,

‎config/common.gmk

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: common.gmk,v 1.53 2008/12/03 13:35:36 gcosmo Exp $
1+
# $Id: common.gmk,v 1.53.2.1 2009/03/03 11:13:05 gcosmo Exp $
22
# ----------------------------------------------------------------
33
# Common part of GNUmakefile for libraries. John Allison, 5/7/95.
44
# ----------------------------------------------------------------
@@ -150,6 +150,7 @@ clean::
150150
@rm -f $(G4LIBDIR)/*$(name).exp
151151
@rm -f $(G4LIBDIR)/lib$(name).$(SHEXT)
152152
@rm -rf $(G4TMPDIR)
153+
@rm -rf moc
153154
endif
154155

155156
clean_libs::

‎config/globlib.gmk

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: globlib.gmk,v 1.28 2005/12/07 09:53:46 gcosmo Exp $
1+
# $Id: globlib.gmk,v 1.28.8.1 2009/03/03 11:13:05 gcosmo Exp $
22
# --------------------------------------------------------------
33
# Script for compound libraries. Gabriele Cosmo, 25/6/98.
44
# --------------------------------------------------------------
@@ -115,6 +115,7 @@ clean::
115115
rm -f $(G4LIBDIR)/*$$lib.exp;\
116116
rm -f $(G4LIBDIR)/*$$lib.$(SHEXT) );\
117117
done
118+
@for dir in $(SUBDIRS); do (rm -rf $$dir/moc); done
118119
@rm -f $(G4LIBDIR)/*$(name).a
119120
@rm -f $(G4LIBDIR)/*$(name).lib
120121
@rm -f $(G4LIBDIR)/*$(name).exp

‎config/sys/Linux-g++.gmk

+11-24
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ ifeq ($(G4SYSTEM),Linux-g++)
5353
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
5454
endif
5555
ifndef X11LIBS
56-
X11LIBS := -L/usr/X11R6/lib$(ARCH) -lXmu -lXt -lXext -lX11 -lSM -lICE
56+
X11LIBS := -L/usr/X11R6/lib$(ARCH) -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
5757
endif
5858
ifndef XMFLAGS
5959
XMFLAGS := -I/usr/X11R6/include
@@ -87,29 +87,19 @@ ifeq ($(G4SYSTEM),Linux-g++)
8787

8888
ifndef QTFLAGS
8989
ifeq ($(QT_VERSION),4)
90-
QTFLAGS += -I$(QTHOME)/include/qt$(QT_VERSION)
91-
QTFLAGS += -I $(QTHOME)/include/qt$(QT_VERSION)/QtCore
92-
QTFLAGS += -I $(QTHOME)/include/qt$(QT_VERSION)/QtGui
93-
QTFLAGS += -I $(QTHOME)/include/qt$(QT_VERSION)/QtOpenGL
90+
QTFLAGS += -I$(QTHOME)/include
91+
QTFLAGS += -I $(QTHOME)/include/QtCore
92+
QTFLAGS += -I $(QTHOME)/include/QtGui
93+
QTFLAGS += -I $(QTHOME)/include/QtOpenGL
9494
else
95-
QTFLAGS := -I$(QTHOME)/include/qt$(QT_VERSION)/Qt
96-
QTFLAGS += -I$(QTHOME)/include/qt$(QT_VERSION)
97-
endif
98-
endif
99-
ifndef QTLIBPATH
100-
QT_SEARCH_LIB1 := $(shell ls $(QTHOME)/lib/qt$(QT_VERSION)/libq* 2>/dev/null | wc -l )
101-
QT_SEARCH_LIB2 := $(shell ls $(QTHOME)/lib/libq* 2>/dev/null | wc -l )
102-
ifneq ($(QT_SEARCH_LIB1),0)
103-
QTLIBPATH := /lib/qt$(QT_VERSION)
104-
endif
105-
ifneq ($(QT_SEARCH_LIB2),0)
106-
QTLIBPATH := /lib
95+
QTFLAGS := -I$(QTHOME)/include/Qt
96+
QTFLAGS += -I$(QTHOME)/include
10797
endif
10898
endif
10999
ifndef QTLIBS
110-
QTLIBS := -L$(QTHOME)$(QTLIBPATH)
100+
QTLIBS := -L$(QTHOME)/lib
111101
ifeq ($(QT_VERSION),3)
112-
QT3_MT := $(shell ls $(QTHOME)$(QTLIBPATH)/libqt-mt.* 2>/dev/null | wc -l )
102+
QT3_MT := $(shell ls $(QTHOME)/lib/libqt-mt.* 2>/dev/null | wc -l )
113103
ifneq ($(QT3_MT),0)
114104
QTLIBS += -lqt-mt
115105
else
@@ -121,11 +111,8 @@ ifeq ($(G4SYSTEM),Linux-g++)
121111
endif
122112
endif
123113
ifndef GLQTLIBS
124-
ifeq ($(QT_VERSION),3)
125-
# already done in QTLIBS
126-
# GLQTLIBS := $(QTLIBS)
127-
else
128-
GLQTLIBS := -L$(QTHOME)$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
114+
ifneq ($(QT_VERSION),3)
115+
GLQTLIBS := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtOpenGL
129116
endif
130117
endif
131118
#----------------------------------------------------------------------------

‎config/sys/Linux-icc.gmk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# ------ GNU/LINUX ------ Intel icc 10.1
2+
# ------ GNU/LINUX ------ Intel icc 11.0
33
#
44
ifeq ($(G4SYSTEM),Linux-icc)
55
CXX := icc
@@ -37,7 +37,7 @@ ifeq ($(G4SYSTEM),Linux-icc)
3737
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
3838
endif
3939
ifndef X11LIBS
40-
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lSM -lICE
40+
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
4141
endif
4242
ifndef XMFLAGS
4343
XMFLAGS := -I/usr/X11R6/include

‎config/sys/WIN32-g++.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ifeq ($(G4SYSTEM),WIN32-g++)
4141
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
4242
endif
4343
ifndef X11LIBS
44-
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lSM -lICE
44+
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
4545
endif
4646
ifndef XMFLAGS
4747
XMFLAGS := -I/usr/X11R6/include

0 commit comments

Comments
 (0)