Skip to content

Commit ca42d4f

Browse files
committed
Import Geant4 5.2.2 source tree
1 parent a373ea5 commit ca42d4f

File tree

81 files changed

+2471
-928
lines changed

Some content is hidden

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

81 files changed

+2471
-928
lines changed

Configure

+241-22
Large diffs are not rendered by default.

ReleaseNotes/Patch4.5.2-2.txt

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
2+
Geant4 5.2 - patch-02 Release Notes
3+
-----------------------------------
4+
5+
3 October 2003
6+
7+
List of fixes included in this public patch since release 5.2.p01:
8+
9+
o Configuration script
10+
--------------------
11+
+ Configure:
12+
o Corrected default name for data sets.
13+
o Implemented automatic detection of OpenGL and CLHEP installations.
14+
o Fixed behavior of script on Windows system, corrected definition of
15+
paths and defaults.
16+
o Cleared not allowed configuration drivers.
17+
18+
o Geometry:
19+
--------
20+
+ verification:
21+
o Fixed logic in G4GeomTestSegment::FindSomePoints() in case a
22+
point gets stuck in a loop while along a curved surface.
23+
Addresses also problem report #499.
24+
+ volumes:
25+
o Made optional the printing of information on 'looping' particles
26+
in G4PropagatorInField. It is now controlled by the verbose flag.
27+
Addresses problem report #509.
28+
29+
o Hadronic processes:
30+
------------------
31+
+ management
32+
o Fixed major bug in G4HadronicProcess class, affecting final state
33+
generation in all materials with more than two elements.
34+
+ cross_sections:
35+
o Fixes in the high energy equivalent photon generation in the
36+
electronuclear interactions above 50 GeV.
37+
38+
o Particles:
39+
---------
40+
+ Fixed memory leak for 'theElectronOccupancy' in G4DynamicParticle
41+
assignment operator.
42+
+ Added DecayProperTime to deep copy of G4DecayProduct.
43+
44+
o Examples:
45+
--------
46+
- Updated reference outputs.
47+
- advanced:
48+
+ composite_calorimeter
49+
o Minor fix in inclusion of headers.
50+
- extended:
51+
+ field
52+
o Implemented complete migration to cuts-by-region.
53+
- novice:
54+
+ N05
55+
o Implemented complete migration to cuts-by-region.
56+
57+
----------------------------------------------------------------------------
58+
59+
Technical Notes
60+
---------------
61+
62+
o This patch should be applied on top of release 5.2-patch01.
63+
It is NOT a cumulative patch !
64+
o Technical notes distributed for release 5.2 are also applicable and
65+
valid for this patch.
66+
67+
The code and rebuilt binary libraries for release 5.2 are available through
68+
our "Source Code" Web page: http://cern.ch/geant4
69+
70+
Please refer to the Geant4 User Documentation:
71+
http://cern.ch/geant4/G4UsersDocuments/Overview/html
72+
for further information about using Geant4.

config/scripts/GNUmakefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# $Id: GNUmakefile,v 1.3 2003/05/28 08:03:22 gcosmo Exp $
1+
# $Id: GNUmakefile,v 1.8 2003/10/02 17:57:10 stesting Exp $
22
# --------------------------------------------------------------
3-
# GNUmakefile for config scripts. Sergei Sadilov, 13/12/02.
3+
# GNUmakefile for tests module. Gabriele Cosmo, 27/06/98.
44
# --------------------------------------------------------------
55

66
name := Marker

config/scripts/binmake.gmk

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: binmake.gmk,v 1.3 2003/05/28 08:03:22 gcosmo Exp $
1+
# $Id: binmake.gmk,v 1.8 2003/10/02 17:57:10 stesting Exp $
22
# ----------------------------------------------------------
33
# Script defining rules and paths for making binaries.
44
# First implementation: Gabriele Cosmo, 25/06/1998.
@@ -95,6 +95,8 @@ ifndef INCFLAGS
9595
-I$(G4BASE)/geometry/solids/specific/include \
9696
-I$(G4BASE)/geometry/solids/BREPS/include \
9797
-I$(G4BASE)/geometry/solids/Boolean/include \
98+
-I$(G4BASE)/geometry/solids/STEP/include \
99+
-I$(G4BASE)/geometry/solids/STEPinterface/include \
98100
-I$(G4BASE)/geometry/volumes/include \
99101
-I$(G4BASE)/geometry/verification/include \
100102
-I$(G4BASE)/geometry/magneticfield/include \
@@ -109,12 +111,8 @@ ifndef INCFLAGS
109111
-I$(G4BASE)/event/include \
110112
-I$(G4BASE)/graphics_reps/include \
111113
-I$(G4BASE)/intercoms/include
112-
ifdef G4USE_STEP
113-
INCFLAGS += -I$(G4BASE)/geometry/solids/STEP/include \
114-
-I$(G4BASE)/geometry/solids/STEPinterface/include
115-
endif
116114
ifdef G4USE_G3TOG4
117-
INCFLAGS += -I$(G4BASE)/g3tog4/include
115+
INCFLAGS += -I$(G4BASE)/g3tog4/include
118116
endif
119117
endif
120118
endif
@@ -230,7 +228,7 @@ else
230228
endif
231229
LDLIBS_PREFINAL += $(LDLIBS4)
232230

233-
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
231+
ifeq ($(G4SYSTEM),WIN32-VC)
234232
WIN32TMP := $(patsubst -L%,$(LIB_PATH)%,$(LDFLAGS))
235233
LDFLAGS = $(patsubst /,$(PATH_DEL),$(WIN32TMP))
236234
LDLIBS = $(patsubst -l%,lib%.a,$(LDLIBS_PREFINAL))
@@ -333,7 +331,7 @@ $(G4TMPDIR)/exe/$(G4TARGET).d: $(G4TARGET).cc
333331
@if [ ! -d $(G4TMPDIR)/exe ] ; then mkdir $(G4TMPDIR)/exe ;fi
334332
@echo Making dependency for file $<...
335333
@set -e;\
336-
g++ $(GPPFLAGS) $(CPPFLAGS) -w $< |\
334+
g++ $(GPPFLAGS) $(CPPFLAGS) $< |\
337335
sed 's!$(G4TARGET)\.o!$(G4TMPDIR)/exe/& $@!' >$@;\
338336
[ -s $@ ] || rm -f $@
339337
ifneq ($(dependencies),)

config/scripts/env.csh.SH

+43-2
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,20 @@ setenv G4USE_G3TOG4 1
287287
echo "On this machine the G4USE_G3TOG4=\$G4USE_G3TOG4"
288288
endif
289289
290+
#
291+
# Use STEP module
292+
#
293+
#+
294+
if ( X$g4wlib_build_step == Xy ) then
295+
setenv G4LIB_BUILD_STEP 1
296+
echo "On this machine the G4LIB_BUILD_STEP=\$G4LIB_BUILD_STEP"
297+
endif
298+
299+
if ( X$g4w_use_step == Xy ) then
300+
setenv G4USE_STEP 1
301+
echo "On this machine the G4USE_STEP=\$G4USE_STEP"
302+
endif
303+
290304
#+
291305
#
292306
# g4shared
@@ -334,11 +348,38 @@ $spitshell >>env.csh <<'!NO!SUBS!'
334348
if ( ${?G4WORKDIR} ) then
335349
echo "In your environment you have the G4WORKDIR=$G4WORKDIR"
336350
else
337-
echo "G4WORKDIR will be set to HOME=$HOME."
338-
setenv G4WORKDIR $HOME
351+
# Check for Windows!
352+
if ( "X$G4SYSTEM" == "XWIN32-VC" || "X$G4SYSTEM" == "XWIN32-VC7" ) then
353+
354+
setenv checkdrive `echo $HOME|cut -d"/" -f2`
355+
356+
if ( "X$checkdrive" == "Xcygdrive" ) then
357+
358+
setenv windrive `echo $HOME|cut -d"/" -f3`
359+
setenv winpath `echo $HOME|cut -d"/" -f4-`
360+
361+
setenv fullwinpath "$windrive:/$winpath"
362+
setenv G4WORKDIR $fullwinpath
363+
364+
endif # if cygwin syntax is used
365+
366+
if ( "X$winpath" == "X" ) then
367+
echo "G4WORKDIR will be set to ${G4WORKDIR}geant4 (in "native" Windows syntax)."
368+
setenv G4WORKDIR ${G4WORKDIR}geant4
369+
else
370+
echo "G4WORKDIR will be set to $G4WORKDIR/geant4 (in "native" Windows syntax)."
371+
setenv G4WORKDIR $G4WORKDIR/geant4
339372
endif
340373
341374
375+
else # if Unix
376+
377+
echo "G4WORKDIR will be set to HOME/geant4=$HOME/geant4"
378+
setenv G4WORKDIR $HOME/geant4
379+
380+
endif
381+
endif
382+
342383
!NO!SUBS!
343384
chmod 755 env.csh
344385
$eunicefix env.csh

config/scripts/env.sh.SH

+57-3
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,26 @@ echo "On this machine the G4USE_G3TOG4=\$G4USE_G3TOG4"
410410
fi
411411
fi
412412
413+
#
414+
# Use STEP module
415+
#
416+
#+
417+
if [ X$g4wlib_build_step = Xy ] ; then
418+
G4LIB_BUILD_STEP=1
419+
export G4LIB_BUILD_STEP
420+
if [ X\$g4non_display = X ] ; then
421+
echo "On this machine the G4LIB_BUILD_STEP=\$G4LIB_BUILD_STEP"
422+
fi
423+
fi
424+
425+
if [ X$g4w_use_step = Xy ] ; then
426+
G4USE_STEP=1
427+
export G4USE_STEP
428+
if [ X\$g4non_display = X ] ; then
429+
echo "On this machine the G4USE_STEP=\$G4USE_STEP"
430+
fi
431+
fi
432+
413433
#+
414434
#
415435
# g4shared
@@ -470,14 +490,48 @@ $spitshell >>env.sh <<'!NO!SUBS!'
470490
# G4WORKDIR
471491
#
472492
if [ $G4WORKDIR ] ; then
493+
473494
if [ X$g4non_display = X ] ; then
474495
echo "In your environment you have the G4WORKDIR=$G4WORKDIR"
475-
fi
496+
fi # if non_display
497+
476498
else
499+
477500
if [ X$g4non_display = X ] ; then
478-
echo "G4WORKDIR will be set to HOME=$HOME."
501+
502+
# Check for Windows!
503+
if test "X$G4SYSTEM" = "XWIN32-VC" -o "X$G4SYSTEM" = "XWIN32-VC7"; then
504+
505+
checkdrive=`echo $HOME|cut -d"/" -f2`
506+
507+
if test "X$checkdrive" = "Xcygdrive"; then
508+
509+
windrive=`echo $HOME|cut -d"/" -f3`
510+
winpath=`echo $HOME|cut -d"/" -f4-`
511+
512+
fullwinpath="$windrive:/$winpath"
513+
G4WORKDIR=$fullwinpath
514+
515+
fi # if cygwin syntax is used
516+
517+
if test "X$winpath" = "X"; then
518+
echo "G4WORKDIR will be set to ${G4WORKDIR}geant4 (in "native" Windows syntax)"
519+
export G4WORKDIR=${G4WORKDIR}geant4
520+
else
521+
echo "G4WORKDIR will be set to $G4WORKDIR/geant4 (in "native" Windows syntax)"
522+
export G4WORKDIR=${G4WORKDIR}/geant4
479523
fi
480-
export G4WORKDIR=$HOME
524+
525+
526+
else # if Unix
527+
528+
echo "G4WORKDIR will be set to HOME/geant4=$HOME/geant4"
529+
export G4WORKDIR=$HOME/geant4
530+
531+
fi # if platforms
532+
533+
fi
534+
481535
fi
482536
483537
!NO!SUBS!

config/scripts/install.sh.SH

+47-3
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,22 @@ export G4USE_G3TOG4
335335
echo "On this machine the G4USE_G3TOG4=\$G4USE_G3TOG4"
336336
fi
337337
338+
#
339+
# Use STEP module
340+
#
341+
#+
342+
if [ X$g4wlib_build_step = Xy ] ; then
343+
G4LIB_BUILD_STEP=1
344+
export G4LIB_BUILD_STEP
345+
echo "On this machine the G4LIB_BUILD_STEP=\$G4LIB_BUILD_STEP"
346+
fi
347+
348+
if [ X$g4w_use_step = Xy ] ; then
349+
G4USE_STEP=1
350+
export G4USE_STEP
351+
echo "On this machine the G4USE_STEP=\$G4USE_STEP"
352+
fi
353+
338354
#+
339355
#
340356
# g4shared
@@ -375,6 +391,9 @@ fi
375391
376392
#####################################################################
377393
394+
echo g4conf=$g4conf
395+
396+
#####################################################################
378397
# Create GNUmakefile.db to keep ALL GNUmakefile DB :)
379398
380399
if test -f \$G4INSTALL/config/scripts/GNUmakefile.db ; then
@@ -391,20 +410,45 @@ echo ""
391410
echo "Starting installation..."
392411
echo ""
393412
cd $g4install/source
394-
echo `pwd`
413+
#echo `pwd`
395414
396415
# There is no env!
397416
if [ X$g4global = Xy ] ; then
398-
$g4make global
417+
echo ""
418+
rm -rf $g4conf/g4make.log
419+
$g4make global 2>&1 | tee $g4conf/g4make.log
399420
fi
400421
401422
# There is env for binaries - for User: should be set in env.[c]sh!
402423
if [ X$g4granular = Xy ] ; then
403424
G4LIB_USE_GRANULAR=1
404425
export G4LIB_USE_GRANULAR
405-
$g4make
426+
rm -rf $g4conf/g4make.log
427+
$g4make 2>&1 | tee $g4conf/g4make.log
406428
fi
407429
430+
# Check for errors in log file
431+
export err=\$[ \`grep Error $g4conf/g4make.log | wc -w\` ]
432+
# echo err=\$err
433+
434+
if [ X\$err = X0 ] ; then
435+
echo ""
436+
echo "####################################################"
437+
echo "# Your Geant4 installation seems to be successful! #"
438+
echo "# To be sure please have a look into the log file: #"
439+
echo "# $g4conf/g4make.log #"
440+
echo "####################################################"
441+
echo ""
442+
else
443+
echo ""
444+
echo "############################################################"
445+
echo "# It looks like you had errors during Geant4 installation! #"
446+
echo "# Please check log file: #"
447+
echo "# $g4conf/g4make.log #"
448+
echo "############################################################"
449+
echo ""
450+
fi
451+
408452
# There is no env!
409453
if [ X$g4includes_flag = Xy ] ; then
410454
$g4make includes

examples/advanced/composite_calorimeter/History

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------
2-
$Id: History,v 1.12 2003/06/12 15:25:20 ribon Exp $
2+
$Id: History,v 1.13 2003/09/18 09:00:06 vnivanch Exp $
33
-------------------------------------------------------------------
44

55
=========================================================
@@ -9,6 +9,9 @@ $Id: History,v 1.12 2003/06/12 15:25:20 ribon Exp $
99
Example History file
1010
---------------------
1111

12+
18.09.03 V.Ivanchenko (ccal-V05-02-00)
13+
- Complete migration to model EM physics
14+
1215
12.06.2003 - A.Ribon (ccal-V05-01-02)
1316
- Updated the LHEP, QGSP, and QGSC Physics Lists.
1417
Done also some clean up.

0 commit comments

Comments
 (0)