Skip to content

Commit 4873be1

Browse files
gcosmogcosmo
committed
Import Geant4 10.4.2 source tree
1 parent cb38379 commit 4873be1

File tree

233 files changed

+34409
-95779
lines changed

Some content is hidden

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

233 files changed

+34409
-95779
lines changed

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# 21st September 2010 Ben Morgan
55
#
6-
# $Id: CMakeLists.txt 108564 2018-02-16 10:19:00Z gcosmo $
6+
# $Id: CMakeLists.txt 110078 2018-05-15 10:04:54Z gcosmo $
77
#
88

99
#-----------------------------------------------------------------------
@@ -38,7 +38,7 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX
3838
project(Geant4)
3939
set(${PROJECT_NAME}_VERSION_MAJOR 10)
4040
set(${PROJECT_NAME}_VERSION_MINOR 4)
41-
set(${PROJECT_NAME}_VERSION_PATCH 1)
41+
set(${PROJECT_NAME}_VERSION_PATCH 2)
4242
set(${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}")
4343

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

‎ReleaseNotes/Patch4.10.4-2.txt‎

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
2+
Geant4 10.4 - patch-02 Release Notes
3+
------------------------------------
4+
5+
25 May 2018
6+
7+
List of fixes included in this public patch since the public release 10.4.p01:
8+
9+
o Configuration:
10+
-------------
11+
+ CMake:
12+
o Updated to data-set G4RealSurface-2.1.1.
13+
Addressing problem report #2043.
14+
+ GNUMake:
15+
o architecture.gmk: corrected default path for external expat and zlib.
16+
o Darwing-clang.gmk: removed -pthread and -fPIC compilation options.
17+
o WIN32-VC.gmk: updated obsolete configuration for Qt5.
18+
19+
o Event:
20+
-----
21+
o Use G4TrackStack as default and make use of G4SmartTrackStack optional.
22+
Addressing problem report #2040.
23+
24+
o Externals:
25+
---------
26+
+ Corrected GNUmakefile on Windows.
27+
28+
o Geometry:
29+
--------
30+
+ navigation:
31+
o G4PathFinder: in DoNextLinearStep(), use flag for relocated point to
32+
signal move from call to ReLocate(), and ensure that new point is used
33+
in cross-checks in subsequent Locate().
34+
Fix to revert change previously introduced in release 10.4, to keep
35+
fMinStep as 'logical' value, which can be kInfinity when step is not
36+
limited by Navigators. Resolves warnings issued by G4PathFinder for
37+
inaccuracies in relocation. Addressing problem report #2033.
38+
o G4Navigator::GetLocalExitNormal(): fix for normal calculated at the
39+
endpoint of current step, on a 'candidate' next volume. Adds missing
40+
transformation to the frame of the current volume.
41+
Addresses problem report #2054.
42+
o G4Navigator: fix in Set/RestoreSavedState() for setting of
43+
ReplicaNumber.
44+
o G4SafetyHelper: do not limit memorisation of safety in case of parallel
45+
geometries (when a length is not passed to safety method).
46+
Fix to include full message in Exception.
47+
+ solids/Boolean:
48+
o G4BooleanSolid: enhanced warning message for the case of an invalid
49+
(NULL) Boolean construct in GetPointOnSurface() and StackPolyhedron().
50+
Use -1 instead of 0 as default initialisation value for area and
51+
capacity, so to distinguish cases when values are zero referring to
52+
NULL Boolean constructs.
53+
o G4UnionSolid: define simple bounding-box and make use of early returns
54+
in Inside() for points laying outside.
55+
o Improved contruction of G4DiplacedSolid to combine transformations for
56+
nested displaced types.
57+
o Replaced USOLIDS_LIBRARIES with VECGEOM_LIBRARIES in sources.cmake.
58+
+ solids/CSG:
59+
o G4Box: simplified and optimised calculation of normal in method
60+
DistanceToOut(p,v,..).
61+
o Replaced USOLIDS_LIBRARIES with VECGEOM_LIBRARIES in sources.cmake.
62+
+ solids/specific:
63+
o Corrected conversion of input parameters to internal structure (used
64+
for caching for adoption in GDML persistency) in G4UPolycone and
65+
G4UPolyhedra wrappers.
66+
o Replaced USOLIDS_LIBRARIES with VECGEOM_LIBRARIES in sources.cmake.
67+
68+
o Global:
69+
------
70+
+ Updated date and version for 10.4.p02.
71+
72+
o Interfaces:
73+
----------
74+
+ G4UIQt: fixed bug with command guidance including HTML tags inside
75+
(<, > and &) and for "critical errors" message.
76+
77+
o Particles:
78+
---------
79+
+ G4PhaseSpaceDecayChannel: fixed incorrect indexing in ManyBodyDecayIt(),
80+
causing incorrect setting of daughter momentum in 4-body phase-space
81+
decay. Addressing problem report #2053.
82+
83+
o Persistency - gdml
84+
------------------
85+
+ Protect printout of progress in reading/writing by G4VERBOSE.
86+
87+
o Physics Lists
88+
-------------
89+
+ constructors/electromagnetic:
90+
o G4EmModelActivator: fix for Opt4 and single-scattering activation.
91+
Addressing problem report #2045.
92+
93+
o Processes - Electromagnetic:
94+
---------------------------
95+
+ lowenergy:
96+
o G4LivermorePhotoElectricModel: fixed incorrect deletion of static
97+
members when models defined per region. Addressing problem report #2052.
98+
99+
o Processes - Hadronic:
100+
--------------------
101+
+ models/particle_hp:
102+
o G4ParticleHPFissionFS: protect against very rare cases of division
103+
by zero.
104+
+ models/radioactive_decay:
105+
o G4RadioactiveDecay: in ConvolveSourceTimeProfile(), switch from
106+
std::exp() to std::expm1() where small exp arguments are expected.
107+
This greatly reduces cancellation errors as well as the accumulated
108+
error in the variance reduction weight calculation. Although negative
109+
weights still occur, their size is reduced by about ten orders of
110+
magnitude, enough to set negative weights to zero.
111+
G4Radioactivation::ConvolveSourceTimeProfile(): same as above.
112+
Addresses problem report #1480.
113+
o Make sure last stable nuclide in decay chain is included as secondary
114+
in G4RadioactiveDecay::AddDeexcitationSpectrumForBiasMode() and in
115+
G4Radioactivation::AddDeexcitationSpectrumForBiasMode().
116+
Addresses problem report #2024.
117+
118+
o Run:
119+
---
120+
+ G4ExceptionHandler: added track/step/volume information when an
121+
exception happens while event is being processed.
122+
123+
o Visualization:
124+
-------------
125+
+ modeling:
126+
o Fixed bug in calculation of mass of parallel world, protecting for
127+
the case of no material assigned. Addressing problem report #2039.
128+
+ Tree:
129+
o Fixed bug in suppressed writing of repeated parameterised volumes.
130+
o Improved command guidance and advice printing.
131+
132+
o Data sets:
133+
---------
134+
+ Patched data set for measured optical surface reflectance
135+
G4RealSurface-2.1.1:
136+
o Merged LBNL LUTs data introduced in 2.0 with the Davis LUTs.
137+
Addressing problem report #2043.
138+
139+
o Examples:
140+
--------
141+
+ extended/optical/LXe:
142+
o Fixed header guard. Addressing problem report #2041.
143+
144+
----------------------------------------------------------------------------
145+
146+
Technical Notes
147+
---------------
148+
149+
o This patch should be applied on top of release 10.4 or 10.4.p01.
150+
o Technical notes distributed for release 10.4 are also applicable and
151+
valid for this patch.
152+
153+
The code and rebuilt binary libraries for release 10.4.p02 are available
154+
through our "Download" Web page.
155+
156+
Please refer to the Geant4 User Documentation for further information about
157+
using Geant4.

‎cmake/History‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
3131

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

34+
23rd May 2018 - Gunter Folger (cmake-V10-03-54)
35+
- Update Geant4DatasetDefinitions to use G4RealSurface 2.1.1
36+
patched version bringing back data lost in 2.1
37+
3438
26th February 2018 - Ben Morgan (cmake-V10-03-53, 52)
3539
- Geant4InstallData.cmake, Geant4CTest.cmake: Update URL for downloads
3640
to "cern.ch/geant4-data" as the correct alias to new EOS area, seperate

‎cmake/Modules/Geant4DatasetDefinitions.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ geant4_add_dataset(
6868
# - Optical Surfaces
6969
geant4_add_dataset(
7070
NAME RealSurface
71-
VERSION 2.1
71+
VERSION 2.1.1
7272
FILENAME G4RealSurface
7373
EXTENSION tar.gz
7474
ENVVAR G4REALSURFACEDATA
75-
MD5SUM f1c72b31d45905f011e2ec4ea96612f4
75+
MD5SUM 1d0fcc24c7082edae1e22a3d43fbb4d9
7676
)
7777

7878
# - SAID

‎config/History‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
svn log $Id: History 108466 2018-02-15 13:48:04Z gcosmo $
1+
svn log $Id: History 110053 2018-05-15 08:55:49Z gcosmo $
22
-------------------------------------------------------------------
33

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

19+
12th April 2018 Gabriele Cosmo (config-V10-03-09)
20+
- WIN32-VC.gmk: updated obsolete configuration for Qt5.
21+
22+
20th March 2018 Gabriele Cosmo
23+
- architecture.gmk: corrected default path for external expat and zlib.
24+
25+
19th March 2018 Gabriele Cosmo
26+
- architecture.gmk: corrected settings for external expat and zlib.
27+
28+
9th March 2018 Gabriele Cosmo
29+
- Darwing-clang.gmk: removed -pthread and -fPIC compilation options.
30+
1931
14th February 2018 Gabriele Cosmo (config-V10-03-08)
2032
- Disable "-Wl,-force_load" global linker flag for static libraries in macro
2133
Darwing-clang.gmk.

‎config/architecture.gmk‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: architecture.gmk 107491 2017-11-16 09:38:59Z gcosmo $
1+
# $Id: architecture.gmk 110053 2018-05-15 08:55:49Z gcosmo $
22
# ------------------------------------------------------------------------
33
# GEANT 4 - Architecture configuration script for GNU Make
44
#
@@ -288,13 +288,41 @@ endif
288288
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
289289
LDFLAGS += -link $(LIB_PATH)$(G4INSTALL)/lib
290290
endif
291-
ifeq (,$(findstring WIN32-VC,$(G4SYSTEM)))
292-
ifndef G4LIB_USE_EXPAT
293-
LOADLIBS += -lexpat
291+
292+
ifndef G4LIB_USE_EXPAT
293+
ifndef EXPATROOT
294+
EXPATROOT := /usr
295+
endif
296+
ifndef EXPATFLAGS
297+
EXPATFLAGS := -I$(EXPATROOT)/include
294298
endif
295-
ifndef G4LIB_USE_ZLIB
296-
LOADLIBS += -lz
299+
ifndef EXPATLIBS
300+
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
301+
EXPATLIBS := $(LIB_PATH)$(EXPATROOT)/lib expat.lib
302+
else
303+
EXPATLIBS := -L$(EXPATROOT)/lib -lexpat
304+
endif
305+
endif
306+
CPPFLAGS += $(EXPATFLAGS)
307+
LOADLIBS += $(EXPATLIBS)
308+
endif
309+
310+
ifndef G4LIB_USE_ZLIB
311+
ifndef ZLIBROOT
312+
ZLIBROOT := /usr
313+
endif
314+
ifndef ZLIBFLAGS
315+
ZLIBFLAGS := -I$(ZLIBROOT)/include
316+
endif
317+
ifndef ZLIBLIBS
318+
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
319+
ZLIBLIBS := $(LIB_PATH)$(ZLIBROOT)/lib zlib.lib
320+
else
321+
ZLIBLIBS := -L$(ZLIBROOT)/lib -lz
322+
endif
297323
endif
324+
CPPFLAGS += $(ZLIBFLAGS)
325+
LOADLIBS += $(ZLIBLIBS)
298326
endif
299327

300328
# Graphic variables...

‎config/sys/Darwin-clang.gmk‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ifeq ($(G4SYSTEM),Darwin-clang)
2424
endif
2525
endif
2626
ifdef G4MULTITHREADED
27-
CXXFLAGS += -ftls-model=initial-exec -pthread
27+
CXXFLAGS += -ftls-model=initial-exec
2828
endif
2929
ifdef G4OPTIMISE
3030
CXXFLAGS += -O3
@@ -47,11 +47,6 @@ ifeq ($(G4SYSTEM),Darwin-clang)
4747
FCFLAGS += -O2 -g
4848
CCFLAGS += -O2 -g
4949
endif
50-
ifdef G4LIB_BUILD_SHARED
51-
CXXFLAGS += -fPIC
52-
FCFLAGS += -fPIC
53-
CCFLAGS += -fPIC
54-
endif
5550
G4RUNPATHOPTION := -Wl,-rpath
5651
# G4STATIC_MODE += -Wl,-force_load
5752
FC := gfortran

‎config/sys/WIN32-VC.gmk‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,24 @@ ifeq ($(G4SYSTEM),WIN32-VC)
3838
UI32LIBS := gdi32.lib user32.lib
3939
endif
4040
ifndef QTHOME
41-
QTHOME := /usr
41+
QTHOME := /Qt
4242
endif
43-
ifndef QTFLAGS
44-
QTFLAGS := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
43+
ifndef QTFLAGS # Qt5
44+
QTFLAGS := -I$(QTHOME)/include
45+
QTFLAGS += -I$(QTHOME)/include/QtCore
46+
QTFLAGS += -I$(QTHOME)/include/QtGui
47+
QTFLAGS += -I$(QTHOME)/include/QtWidgets
48+
QTFLAGS += -I$(QTHOME)/include/QtOpenGL
49+
QTFLAGS += -I$(QTHOME)/include/QtPrintSupport
4550
endif
4651
ifndef QTMOC
47-
QTMOC := $(QTHOME)/bin/moc
52+
QTMOC := $(QTHOME)/bin/moc
4853
endif
49-
50-
ifndef QTLIBS
51-
QTLIBS := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib
54+
ifndef QTLIBS # Qt5
55+
QTLIBS := $(LIB_PATH)$(QTHOME)/lib Qt5Core.lib Qt5Gui.lib Qt5Widgets.lib Qt5PrintSupport.lib
5256
endif
5357
ifndef GLQTLIBS
54-
GLQTLIBS := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib
58+
GLQTLIBS := $(LIB_PATH)$(QTHOME)/lib Qt5Core.lib Qt5Gui.lib Qt5Widgets.lib Qt5OpenGL.lib Qt5PrintSupport.lib
5559
endif
5660

5761
#
@@ -77,9 +81,6 @@ ifeq ($(G4SYSTEM),WIN32-VC)
7781
# Note that a DLL must be fully linked. You should NOT have undefined
7882
# symbols as output of the link command.
7983
#
80-
ifdef G4LIB_USE_USOLIDS
81-
GLOBLIBS += libG4geomUSolids.lib
82-
endif
8384
ifdef G4LIB_USE_CLHEP
8485
GLOBLIBS += libG4clhep.lib
8586
endif

0 commit comments

Comments
 (0)