Skip to content

Commit 3193069

Browse files
gcosmogcosmo
committed
Import Geant4 8.1.2 source tree
1 parent c332f3e commit 3193069

File tree

136 files changed

+1383
-807
lines changed

Some content is hidden

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

136 files changed

+1383
-807
lines changed

‎ReleaseNotes/Patch4.8.1-2.txt

+112
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
2+
Geant4 8.1 - patch-02 Release Notes
3+
-----------------------------------
4+
5+
10 November 2006
6+
7+
List of fixes included in this public patch since the public release 8.1.p01:
8+
9+
o Geometry:
10+
--------
11+
+ management
12+
o Added empty virtual method CheckOverlaps() to G4VPhysicalVolume to
13+
allow for proper overloading from subclasses. Implementation returns
14+
always 'false', which is the case for replicas.
15+
16+
o Global:
17+
------
18+
+ Corrected inclusion of CLHEP headers in wrapper files
19+
G4SystemOfUnits.hh and G4PhysicalConstants.hh.
20+
21+
o Electromagnetic processes:
22+
-------------------------
23+
+ standard:
24+
o Fixed energy non-conservation in G4PAIModel for positrons. Fix also
25+
concerning 'Tmax' for electrons and positrons: 'Tmax' is defined
26+
now for each particle independently.
27+
o Fixed problem of positron zero incident energy in G4eeToTwoGammaModel.
28+
o Added extra protection inside G4BetheBlochModel.
29+
o Fixed problems and add comments in the classes prototype Coulomb
30+
elastic scattering: G4CoulombScattering, G4CoulombScatteringModel,
31+
G4eCoulombScatteringModel. Set default limit on scattering angle to
32+
zero.
33+
+ utils:
34+
o G4VEnergyLossProcess: made LambdaPhysicsVector() method protected.
35+
o G4ionEffectiveCharge: added protection for NULL pointer to material.
36+
37+
o Hadronic Processes:
38+
------------------
39+
+ models/coherent_elastic:
40+
o Introduced NaN check inside G4HadronElastic, G4ChargeExchange, and
41+
G4UHadronElasticProcess.
42+
o Removed HP data from G4UHadronElasticProcess (it is set in physics
43+
lists); added low energy threshold of 20 MeV in G4HadronElastic for
44+
QElastic. For any particle with kinetic energy below 10 KeV, the
45+
primary particle is returned unchanged and no scattering is sampled.
46+
This prevents situations of low-energy neutrons scattering forever,
47+
and reduces precision in computing scattering for low-energy hadrons.
48+
+ models/utils:
49+
o Reduced warning output from G4Fragment on negative excitation energy;
50+
a maximum of 10 warnings is printed now.
51+
o G4Fancy3DNucleus:ChoosePositions(): correctly use std::vector.
52+
Correction addressing problem report #887 on WIN32/VC8.
53+
o Removed meaningless 'const' qualifier from return type of method
54+
G4Fancy3DNucleusHelper().
55+
56+
o Particles:
57+
---------
58+
+ Fixed bug in G4ParticleDefinition constructor causing not filling quark
59+
contents when G4VERBOSE is not set.
60+
+ Fixed bug in k2(1770) decay. Addresses problem report #894.
61+
62+
o Persistency:
63+
-----------
64+
+ Get Rid of useless forward declarations in G4MCTEvent and
65+
G4MCTGenParticle header files. Clearing compilation warnings on
66+
icc-9.X compilers.
67+
68+
o Track:
69+
-----
70+
+ Made G4StepPoint::operator=() inline for optimisation.
71+
72+
o Physics Lists:
73+
-------------
74+
+ G4HadronElasticPhysics: added explicit inclusions of data headers
75+
in the header file.
76+
77+
o Configuration:
78+
-------------
79+
+ Linux-icc: updated setup to support Intel icc compiler 9.X series.
80+
+ liblist.c: added .dylib search for list of libraries.
81+
Addressing problem report #885.
82+
+ architecture.gmk: added variables for commands: echo, cat, cut, sed;
83+
to be eventually overloaded in system dependent configurations.
84+
Overloaded variables for WIN32-VC to force usage of the original
85+
CygWin built-in commands. Use standard 'echo' command for Darwin-g++.
86+
Replaced system commands with variables defined at architecture level
87+
in source/GNUmakefile.
88+
89+
o Examples:
90+
--------
91+
+ Updated reference outputs.
92+
+ advanced/underground_physics
93+
o Fixed bug: removed uninitialized 'UserLimitsForXenon'.
94+
+ extended/analysis/AnaEx01
95+
o Corrected text in README for AIDA setup.
96+
97+
----------------------------------------------------------------------------
98+
99+
Technical Notes
100+
---------------
101+
102+
o This patch should be applied on top of release 8.1.p01
103+
o Technical notes distributed for release 8.1 are also applicable and
104+
valid for this patch.
105+
106+
The code and rebuilt binary libraries for release 8.1.p02 are available
107+
through our "Source Code" Web page:
108+
http://cern.ch/geant4/support/download.shtml
109+
110+
Please refer to the Geant4 User Documentation:
111+
http://cern.ch/geant4/support/userdocuments.shtml
112+
for further information about using Geant4.

‎config/History

+22-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$Id: History,v 1.278 2006/06/13 15:37:35 gcosmo Exp $
1+
$Id: History,v 1.285.2.1 2006/11/02 12:21:48 gcosmo Exp $
22
-------------------------------------------------------------------
33

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

19+
10th October 2006 Gabriele Cosmo (config-V08-01-05a)
20+
- Darwin-g++.gmk: use standard -echo- command.
21+
Removed ECHO overloaded variable.
22+
23+
5th October 2006 Gabriele Cosmo (config-V08-01-04)
24+
- liblist.c: added .dylib search for list of libraries.
25+
Addressing problem report #885.
26+
27+
3rd October 2006 Gabriele Cosmo (config-V08-01-03)
28+
- architecture.gmk: added variables for commands: echo, cat, cut, sed;
29+
to be eventually overloaded in system dependent configurations.
30+
- WIN32-VC.gmk: overload commands [echo, grep, cat, cut, sed], to force
31+
usage of the original CygWin built-in commands.
32+
33+
18th August 2006 Gabriele Cosmo (config-V08-01-01)
34+
- Linux-icc: corrected G4RUNPATHOPTION flag to allow linking of applications
35+
with shared libraries.
36+
37+
18th August 2006 Gabriele Cosmo (config-V08-01-00)
38+
- Linux-icc: updated setup to support icc-9.X series.
39+
1940
13th June 2006 Gabriele Cosmo (config-V08-00-02)
2041
- Removed defaults for X11, XM, XAW flags in architecture.gmk and added
2142
explicit settings in sys/*.gmk setups protected by ifndef statements for

‎config/architecture.gmk

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: architecture.gmk,v 1.105 2006/06/13 15:36:30 gcosmo Exp $
1+
# $Id: architecture.gmk,v 1.106 2006/10/03 13:45:37 gcosmo Exp $
22
# ------------------------------------------------------------------------
33
# GEANT 4 - Architecture configuration script for GNU Make
44
#
@@ -267,14 +267,26 @@ G4TREP := $(G4TMP)/$(G4TEMPLATE_REPOSITORY)
267267
#
268268
AR := ar r
269269

270-
# Default echo used with makedepend. Changed for SUN-CC, Linux-g++.
270+
# Default echo used with makedepend. Changed for SUN-CC, Linux-g++, WIN32.
271271
#
272272
ECHO:= echo
273273

274-
# Default grep used with source/GNUmakfile. Changed for SUN-CC.
274+
# Default grep used with source/GNUmakefile. Changed for SUN-CC.
275275
#
276276
GREP := grep
277277

278+
# Default cut used with source/GNUmakefile. Changed for WIN32.
279+
#
280+
CUT := cut
281+
282+
# Default cat used with source/GNUmakefile. Changed for WIN32.
283+
#
284+
CAT := cat
285+
286+
# Default sed used with source/GNUmakefile. Changed for WIN32.
287+
#
288+
SED := sed
289+
278290
# Include architecture dependent setups...
279291
#
280292
include $(G4INSTALL)/config/sys/$(G4SYSTEM).gmk

‎config/liblist.c

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: liblist.c,v 1.17 2002/11/22 11:53:10 gcosmo Exp $ */
1+
/* $Id: liblist.c,v 1.18 2006/10/05 14:22:06 gcosmo Exp $ */
22

33
/*
44
Given a "libname.map" file on standard input and a list or directory
@@ -549,6 +549,14 @@ int main (int argc, char** argv) {
549549
{
550550
printf("-l%s ",libmapPtr->lib);
551551
}
552+
else /* case MacOS .dylib */
553+
{
554+
sprintf(libname, "%s/lib%s.dylib", libpath, libmapPtr->lib);
555+
if (!access(libname,R_OK))
556+
{
557+
printf("-l%s ",libmapPtr->lib);
558+
}
559+
}
552560
}
553561
else
554562
{

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

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ ifeq ($(G4SYSTEM),Darwin-g++)
3131
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
3232
LDFLAGS += -bind_at_load
3333
FCLIBS := -lg2c -lnsl
34-
ECHO := /bin/echo -n
3534
SHEXT := dylib
3635
ifndef X11FLAGS
3736
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11

‎config/sys/Linux-icc.gmk

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#
2-
# ------ GNU/LINUX ------ !!! not supported !!!
3-
# Intel icc 8.0
2+
# ------ GNU/LINUX ------ Intel icc 9.1
3+
#
44
ifeq ($(G4SYSTEM),Linux-icc)
55
CXX := icc
66
CXXFLAGS := -ansi -mp -no-gcc -w1
77
ifdef G4OPTIMISE
8-
CXXFLAGS += -O
9-
FCFLAGS := -O
10-
CCFLAGS := -O
8+
CXXFLAGS += -O2
9+
FCFLAGS := -O2
10+
CCFLAGS := -O2
1111
else
1212
ifdef G4DEBUG
1313
CXXFLAGS += -g
@@ -25,12 +25,12 @@ ifeq ($(G4SYSTEM),Linux-icc)
2525
FCFLAGS += -fPIC
2626
CCFLAGS += -fPIC
2727
endif
28-
G4RUNPATHOPTION := -Xlinker -rpath
28+
G4RUNPATHOPTION := -Wl,-rpath -Wl,
2929
CC := gcc
3030
FC := g77
3131
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
3232
FCLIBS := -lg2c -lnsl
33-
AR := xiar r
33+
AR := ar r
3434
ECHO := /bin/echo -e
3535
SHEXT := so
3636
ifndef X11FLAGS
@@ -52,6 +52,7 @@ ifeq ($(G4SYSTEM),Linux-icc)
5252
XAWLIBS := -lXaw
5353
endif
5454
DLDLIBS := -ldl
55+
LOADLIBS += -lcxa -lunwind
5556
ifndef OGLFLAGS
5657
OGLFLAGS := -I$(OGLHOME)/include
5758
endif

‎config/sys/WIN32-VC.gmk

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# ------ WIN32/VC ------ Visual-C++ 7 .NET
2+
# ------ WIN32/VC ------ Visual-C++ 7 .NET and higher
33
#
44
ifeq ($(G4SYSTEM),WIN32-VC)
55
CXX := CL
@@ -17,7 +17,12 @@ ifeq ($(G4SYSTEM),WIN32-VC)
1717

1818
SHEXT := dll
1919
AR := LIB
20-
ECHO := echo -e
20+
ECHO := /usr/bin/echo -e
21+
GREP := /usr/bin/grep
22+
SED := /usr/bin/sed
23+
CAT := /usr/bin/cat
24+
CUT := /usr/bin/cut
25+
2126
FC := g77
2227
# FCLIBS := -lf2c
2328
ifndef OGLFLAGS
@@ -57,20 +62,20 @@ ifeq ($(G4SYSTEM),WIN32-VC)
5762
define build-granular-shared-lib
5863
@libdir=`(cd $(@D);/bin/pwd)`;\
5964
cd $(G4TMP)/$(G4SYSTEM);\
60-
echo "Building $(name).dumpbin file ...";\
65+
$(ECHO) "Building $(name).dumpbin file ...";\
6166
$(RM) $(name).dumpbin;\
6267
dumpbin /symbols $(G4LIBDIR)/lib$(name).a > $(name).dumpbin;\
63-
echo "Building $(name).def file ...";\
68+
$(ECHO) "Building $(name).def file ...";\
6469
$(RM) $(name).def;\
6570
$(G4LIB)/$(G4SYSTEM)/win32def.exe $(name) < $(name).dumpbin > $(name).def;\
6671
$(RM) $(name).dumpbin;\
67-
echo "Building lib$(name).exp and lib$(name).lib file ...";\
72+
$(ECHO) "Building lib$(name).exp and lib$(name).lib file ...";\
6873
$(RM) $(G4LIBDIR)/lib$(name).exp;\
6974
$(RM) $(G4LIBDIR)/lib$(name).lib;\
7075
lib.exe /nologo /machine:ix86 /def:$(name).def \
7176
/out:$(G4LIBDIR)/lib$(name).lib;\
7277
$(RM) $(G4LIBDIR)/$(name).dll;\
73-
echo "Building $(name).dll file ...";\
78+
$(ECHO) "Building $(name).dll file ...";\
7479
link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
7580
$(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
7681
/libpath:$(G4LIBDIR) $(GLOBLIBS) \
@@ -80,20 +85,20 @@ ifeq ($(G4SYSTEM),WIN32-VC)
8085
define build-global-shared-lib
8186
@libdir=`(cd $(@D);/bin/pwd)`;\
8287
cd $(G4TMP)/$(G4SYSTEM);\
83-
echo "Building $(name).dumpbin file ...";\
88+
$(ECHO) "Building $(name).dumpbin file ...";\
8489
$(RM) $(name).dumpbin;\
8590
dumpbin /symbols $(G4LIBDIR)/lib$(name).a > $(name).dumpbin;\
86-
echo "Building $(name).def file ...";\
91+
$(ECHO) "Building $(name).def file ...";\
8792
$(RM) $(name).def;\
8893
$(G4LIB)/$(G4SYSTEM)/win32def.exe $(name) < $(name).dumpbin > $(name).def;\
8994
$(RM) $(name).dumpbin;\
90-
echo "Building lib$(name).exp and lib$(name).lib ...";\
95+
$(ECHO) "Building lib$(name).exp and lib$(name).lib ...";\
9196
$(RM) $(G4LIBDIR)/lib$(name).exp;\
9297
$(RM) $(G4LIBDIR)/lib$(name).lib;\
9398
lib.exe /nologo /machine:ix86 /def:$(name).def \
9499
/out:$(G4LIBDIR)/lib$(name).lib;\
95100
$(RM) $(G4LIBDIR)/$(name).dll;\
96-
echo "Building $(name).dll ...";\
101+
$(ECHO) "Building $(name).dll ...";\
97102
link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
98103
$(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
99104
/libpath:$(G4LIBDIR) $(GLOBLIBS) \

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

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
2-
# ------ GNU/WIN32 CYGNUS ------ !!! not supported !!!
2+
# ------ GNU/WIN32 CYGWIN ------ !!! not supported !!!
33
# Cygnus CygWin - gcc-3.2 and higher
4-
# Windows 2000/XP
4+
# Windows XP
55
#
66
# Stefano Agostinelli ([email protected]) - IST Group, Genova
77
#
@@ -25,12 +25,18 @@ ifeq ($(G4SYSTEM),WIN32-g++)
2525
FCFLAGS += -fPIC
2626
CCFLAGS += -fPIC
2727
endif
28+
2829
G4RUNPATHOPTION := -Wl,-rpath
30+
SHEXT := so
31+
ECHO := echo -e
32+
GREP := /usr/bin/grep
33+
SED := /usr/bin/sed
34+
CAT := /usr/bin/cat
35+
CUT := /usr/bin/cut
36+
2937
FC := g77
3038
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
3139
FCLIBS := -lg2c -lnsl
32-
ECHO := echo -e
33-
SHEXT := so
3440
ifndef X11FLAGS
3541
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
3642
endif

‎examples/advanced/lAr_calorimeter/src/FCALEMModuleSD.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// ********************************************************************
2525
//
2626
// $Id: FCALEMModuleSD.cc,v 1.12 2006/07/21 11:45:53 ribon Exp $
27-
// GEANT4 tag $Name: geant4-08-01-patch-01 $
27+
// GEANT4 tag $Name: geant4-08-01-patch-02 $
2828
//
2929
//
3030

‎examples/advanced/lAr_calorimeter/src/FCALHadModuleSD.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// ********************************************************************
2525
//
2626
// $Id: FCALHadModuleSD.cc,v 1.10 2006/07/21 11:45:53 ribon Exp $
27-
// GEANT4 tag $Name: geant4-08-01-patch-01 $
27+
// GEANT4 tag $Name: geant4-08-01-patch-02 $
2828
//
2929
//
3030

‎examples/advanced/lAr_calorimeter/src/FCALPrimaryGeneratorAction.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// ********************************************************************
2525
//
2626
// $Id: FCALPrimaryGeneratorAction.cc,v 1.9 2006/07/21 08:19:33 gcosmo Exp $
27-
// GEANT4 tag $Name: geant4-08-01-patch-01 $
27+
// GEANT4 tag $Name: geant4-08-01-patch-02 $
2828
//
2929
//
3030

‎examples/advanced/radioprotection/remsim.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
//
2626
//
2727
// $Id: remsim.cc,v 1.14 2006/07/24 09:53:27 guatelli Exp $
28-
// GEANT4 tag $Name: geant4-08-01-patch-01 $
28+
// GEANT4 tag $Name: geant4-08-01-patch-02 $
2929

3030
#include "G4RunManager.hh"
3131
#include "G4UImanager.hh"

‎examples/advanced/raredecay_calorimetry/PhotIn.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
*************************************************************
3-
Geant4 version Name: global-V08-00-04 (30-June-2006)
3+
Geant4 version Name: geant4-08-01-patch-02-ref (10-November-2006)
44
Copyright : Geant4 Collaboration
55
Reference : NIM A 506 (2003), 250-303
66
WWW : http://cern.ch/geant4

0 commit comments

Comments
 (0)